diff --git a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml index 7e7a407b40..948479e98b 100644 --- a/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml +++ b/src/Hl7.Fhir.Base/CompatibilitySuppressions.xml @@ -239,6 +239,34 @@ lib/net8.0/Hl7.Fhir.Base.dll true + + CP0002 + M:Hl7.Fhir.Model.Attachment.get_UrlElement + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Model.Base.AsReadOnlyDictionary + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Model.Base.get_Children + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0002 + M:Hl7.Fhir.Model.Base.get_NamedChildren + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + CP0002 M:Hl7.Fhir.Model.Parameters.get_Item(System.String) @@ -568,6 +596,405 @@ lib/net8.0/Hl7.Fhir.Base.dll true + + CP0008 + T:Hl7.Fhir.Model.Attachment + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.BackboneElement + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.BackboneType + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Base + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Base64Binary + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Binary + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Bundle + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Bundle.EntryComponent + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Bundle.LinkComponent + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Bundle.RequestComponent + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Bundle.ResponseComponent + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Bundle.SearchComponent + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Canonical + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Code + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Code`1 + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.CodeableConcept + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.CodeableReference + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Coding + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.ContactDetail + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.ContactPoint + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.DataType + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Date + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.DomainResource + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Element + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Extension + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.FhirBoolean + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.FhirDateTime + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.FhirDecimal + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.FhirString + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.FhirUri + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.FhirUrl + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Id + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Identifier + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Instant + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Integer + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Integer64 + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Markdown + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Meta + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Narrative + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Oid + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.OperationOutcome + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.OperationOutcome.IssueComponent + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Parameters + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Parameters.ParameterComponent + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Period + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.PositiveInt + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.PrimitiveType + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Quantity + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Range + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Resource + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.ResourceReference + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Signature + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Time + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.UnsignedInt + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.UsageContext + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.Uuid + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + + + CP0008 + T:Hl7.Fhir.Model.XHtml + lib/net8.0/Hl7.Fhir.Base.dll + lib/net8.0/Hl7.Fhir.Base.dll + true + CP0008 T:Hl7.Fhir.Serialization.BaseTypedElement diff --git a/src/Hl7.Fhir.Base/ElementModel/NewPocoBuilder.cs b/src/Hl7.Fhir.Base/ElementModel/NewPocoBuilder.cs index 9ad3073af2..8209c3ff88 100644 --- a/src/Hl7.Fhir.Base/ElementModel/NewPocoBuilder.cs +++ b/src/Hl7.Fhir.Base/ElementModel/NewPocoBuilder.cs @@ -40,7 +40,7 @@ public Base BuildFrom(ITypedElement source) private Base readFromElement(ITypedElement node, ClassMapping classMapping) { - IDictionary newInstance = buildNewInstance(classMapping); + var newInstance = buildNewInstance(classMapping); // Capture the instance type if this is a dynamic type. if(newInstance is IDynamicType dt) @@ -79,7 +79,6 @@ private Base readFromElement(ITypedElement node, ClassMapping classMapping) var childClassMapping = classMappingForElement(child, propertyMapping); var convertedValue = readFromElement(child, childClassMapping); - // In case the convertedValue does not agree with the actual POCO type of the property, this // method will throw an InvalidCastException. Later, we could salvage // the data we have so far, and put it in an annotation. @@ -87,7 +86,7 @@ private Base readFromElement(ITypedElement node, ClassMapping classMapping) setOrAddProperty(child, newInstance, convertedValue, propertyMapping); } - return (Base)newInstance; + return newInstance; } private static void raiseFormatError(string message, string location) @@ -95,14 +94,13 @@ private static void raiseFormatError(string message, string location) throw Error.Format("While building a POCO: " + message, location); } - private static IDictionary buildNewInstance(ClassMapping mapping) + private static Base buildNewInstance(ClassMapping mapping) { - return mapping.Factory() switch - { - IDictionary b => b, - _ => throw Error.InvalidOperation($"Class Factory for '{mapping.Name}' did not return a dictionary, which is required for " + - $"building up POCO's dynamically.") - }; + if (mapping.Factory() is Base b) return b; + + throw Error.InvalidOperation($"Class Factory for '{mapping.Name}' did not return a " + + $"Base, which is required for " + + $"building up POCO's dynamically."); } private IList buildNewList(PropertyMapping? propertyMapping, Type elementType) @@ -118,7 +116,7 @@ private IList buildNewList(PropertyMapping? propertyMapping, Type elementType) } var propertyClassMapping = getClassMapping(propertyMapping.ImplementingType); - return propertyClassMapping?.ListFactory() ?? new List(); + return propertyClassMapping.ListFactory() ?? new List(); } private ClassMapping classMappingForElement(ITypedElement node, PropertyMapping? propertyMapping) @@ -212,7 +210,7 @@ private ClassMapping getClassMapping(Type t) => private ClassMapping getClassMapping() => getClassMapping(typeof(T)); - private void setOrAddProperty(ITypedElement node, IDictionary target, + private void setOrAddProperty(ITypedElement node, Base target, Base convertedValue, PropertyMapping? propertyMapping) { // If this element *could* be repeating (either we don't know the definition, or it really is defined @@ -291,7 +289,7 @@ private void setOrAddProperty(ITypedElement node, IDictionary ta /// /// Convert the value of a typed element to a value that can be set on a POCO property. /// - private object convertTypedElementValue(object value, string? instanceType) + private static object convertTypedElementValue(object value, string? instanceType) { return value switch { diff --git a/src/Hl7.Fhir.Base/ElementModel/PocoElementNode.cs b/src/Hl7.Fhir.Base/ElementModel/PocoElementNode.cs index 11de6c464c..4f5dcaa8c3 100644 --- a/src/Hl7.Fhir.Base/ElementModel/PocoElementNode.cs +++ b/src/Hl7.Fhir.Base/ElementModel/PocoElementNode.cs @@ -75,9 +75,9 @@ private Type determineInstanceType(PropertyMapping definition) }; } - public IElementDefinitionSummary Definition { get; private set; } + public IElementDefinitionSummary Definition { get; } - public string ShortPath { get; private set; } + public string ShortPath { get; } /// /// Elements from the IReadOnlyDictionary can be of type , IEnumerable<Base> or string. @@ -107,15 +107,13 @@ public IEnumerable Children(string name) { if (Current is null) return Enumerable.Empty(); - var rod = Current.AsReadOnlyDictionary(); - if (name is null) { - return rod.SelectMany(kvp + return Current.GetElementPairs().SelectMany(kvp => createChildNodes(kvp.Key, kvp.Value)); } - rod.TryGetValue(name, out var dictValue); + Current.TryGetValue(name, out var dictValue); return createChildNodes(name, dictValue); IEnumerable createChildNodes(string childName, object value) @@ -185,18 +183,13 @@ public object Value { get { - if (Current is PrimitiveType p && p.ObjectValue != null) - { - if (p.ObjectValue != _lastCachedValue) - { - _value = ToITypedElementValue(); - _lastCachedValue = p.ObjectValue; - } - - return _value; - } - else - return null; + if (Current is not PrimitiveType { ObjectValue: not null } p) return null; + + if (p.ObjectValue == _lastCachedValue) return _value; + + _value = ToITypedElementValue(); + _lastCachedValue = p.ObjectValue; + return _value; } } diff --git a/src/Hl7.Fhir.Base/Model/Base.Dictionary.cs b/src/Hl7.Fhir.Base/Model/Base.Dictionary.cs index 5c55ebe274..8cbd87fc57 100644 --- a/src/Hl7.Fhir.Base/Model/Base.Dictionary.cs +++ b/src/Hl7.Fhir.Base/Model/Base.Dictionary.cs @@ -7,87 +7,43 @@ namespace Hl7.Fhir.Model; -public abstract partial class Base: IReadOnlyDictionary, IDictionary +public class BaseDictionary(Base wrapped) : IReadOnlyDictionary { - private object get(string key) => - this.TryGetValue(key, out var value) - ? value - : throw new KeyNotFoundException($"Element '{key}' is not a known FHIR element or has no value."); - - public IReadOnlyDictionary AsReadOnlyDictionary() => this; - public IDictionary AsDictionary() => this; + private static object wrap(object value) => + value switch + { + Base b => new BaseDictionary(b), + _ => value + }; #region IReadOnlyDictionary - IEnumerable IReadOnlyDictionary.Keys => GetElementPairs().Select(kvp => kvp.Key); - IEnumerable IReadOnlyDictionary.Values => GetElementPairs().Select(kvp => kvp.Value); - int IReadOnlyCollection>.Count => GetElementPairs().Count(); - object IReadOnlyDictionary.this[string key] => get(key); - - bool IReadOnlyDictionary.TryGetValue(string key, out object value) => - TryGetValue(key, out value!); - - bool IReadOnlyDictionary.ContainsKey(string key) => TryGetValue(key, out _); - - IEnumerator> IEnumerable>.GetEnumerator() => - GetElementPairs().GetEnumerator(); - - IEnumerator IEnumerable.GetEnumerator() => GetElementPairs().GetEnumerator(); - - #endregion - - #region IDictionary - - void ICollection>.Add(KeyValuePair item) => - AsDictionary().Add(item.Key, item.Value); - - void ICollection>.Clear() - { - // Slow.... - foreach (var kvp in this) - SetValue(kvp.Key, null); - } + IEnumerable IReadOnlyDictionary.Keys => wrapped.GetElementPairs().Select(kvp => kvp.Key); + IEnumerable IReadOnlyDictionary.Values => wrapped.GetElementPairs().Select(kvp => wrap(kvp.Value)); + int IReadOnlyCollection>.Count => wrapped.GetElementPairs().Count(); - bool ICollection>.Contains(KeyValuePair item) => - TryGetValue(item.Key, out _); // we don't care about the item, we cannot have the same key twice. + object IReadOnlyDictionary.this[string key] => wrap(wrapped[key]); - void ICollection>.CopyTo(KeyValuePair[] array, int arrayIndex) + bool IReadOnlyDictionary.TryGetValue(string key, out object value) { - foreach (var kvp in this) - array[arrayIndex++] = kvp; + if (wrapped.TryGetValue(key, out var unwrapped)) + { + value = wrap(unwrapped); + return true; + } + + value = null!; + return false; } - bool ICollection>.Remove(KeyValuePair item) => - AsDictionary().Remove(item.Key); + bool IReadOnlyDictionary.ContainsKey(string key) => wrapped.TryGetValue(key, out _); - int ICollection>.Count => AsReadOnlyDictionary().Count; - bool ICollection>.IsReadOnly => false; - ICollection IDictionary.Values => AsReadOnlyDictionary().Values.ToList(); - ICollection IDictionary.Keys => AsReadOnlyDictionary().Keys.ToList(); - bool IDictionary.TryGetValue(string key, out object value) => TryGetValue(key, out value!); - - object IDictionary.this[string key] - { - get => this.AsReadOnlyDictionary()[key]; - set => SetValue(key, value); - } - - void IDictionary.Add(string key, object value) - { - if (TryGetValue(key, out _)) - throw new ArgumentException($"An element with the key '{key}' already exists in the dictionary."); - - SetValue(key, value); - } - - bool IDictionary.ContainsKey(string key) => TryGetValue(key, out _); + IEnumerator> IEnumerable>.GetEnumerator() => + wrapped.GetElementPairs().Select(kvp => KeyValuePair.Create(kvp.Key, wrap(kvp.Value))).GetEnumerator(); - bool IDictionary.Remove(string key) - { - var existed = TryGetValue(key, out _); - SetValue(key, null); - return existed; - } + IEnumerator IEnumerable.GetEnumerator() => + wrapped.GetElementPairs().Select(kvp => KeyValuePair.Create(kvp.Key, wrap(kvp.Value))).GetEnumerator(); #endregion + } \ No newline at end of file diff --git a/src/Hl7.Fhir.Base/Model/Base.Extensions.cs b/src/Hl7.Fhir.Base/Model/Base.Extensions.cs new file mode 100644 index 0000000000..261b45612c --- /dev/null +++ b/src/Hl7.Fhir.Base/Model/Base.Extensions.cs @@ -0,0 +1,39 @@ +#nullable enable +using System; +using System.Collections; +using System.Collections.Generic; + +namespace Hl7.Fhir.Model; + +public static class BaseExtensions +{ + [Obsolete("Use GetElementPairs() instead. Note that with GetElementPairs(), the elements are not guaranteed to " + + "be the same type, as they reflect the type in the actual POCO definition.")] + public static IEnumerable Children(this Base instance) + { + foreach (var element in instance.GetElementPairs()) + { + switch (element.Key, element.Value) + { + case ("div", XHtml xhtml): + yield return new FhirString(xhtml.Value); + break; + case ("id", string id): + yield return new FhirString(id); + break; + case ("url", string url): + yield return new FhirUri(url); + break; + case (_, IEnumerable list): + foreach (var item in list) + yield return item; + break; + case("value", _) when instance is PrimitiveType: + yield break; + default: + yield return (Base)element.Value; + break; + } + } + } +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Base/Model/Base.cs b/src/Hl7.Fhir.Base/Model/Base.cs index 5d64453eab..4a4873687a 100644 --- a/src/Hl7.Fhir.Base/Model/Base.cs +++ b/src/Hl7.Fhir.Base/Model/Base.cs @@ -33,11 +33,11 @@ POSSIBILITY OF SUCH DAMAGE. using Hl7.Fhir.Introspection; using Hl7.Fhir.Utility; using System; -using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Diagnostics.CodeAnalysis; +using System.Linq; using System.Runtime.Serialization; using System.Threading; @@ -95,7 +95,7 @@ protected virtual void OnPropertyChanged(string property) => #endregion - protected virtual Base SetValue(string key, object? value) + internal protected virtual Base SetValue(string key, object? value) { if (value is null) Overflow.Remove(key); @@ -105,10 +105,18 @@ protected virtual Base SetValue(string key, object? value) return this; } - protected virtual bool TryGetValue(string key, [NotNullWhen(true)] out object? value) => + internal object this[string key] + { + get => this.TryGetValue(key, out var value) + ? value + : throw new KeyNotFoundException($"Element '{key}' is not a known FHIR element or has no value."); + set => SetValue(key, value); + } + + internal protected virtual bool TryGetValue(string key, [NotNullWhen(true)] out object? value) => Overflow.TryGetValue(key, out value); - protected virtual IEnumerable> GetElementPairs() => Overflow; + internal protected virtual IEnumerable> GetElementPairs() => Overflow; // TODO bring Children + NamedChildren over as well. } \ No newline at end of file diff --git a/src/Hl7.Fhir.Base/Model/DynamicDataType.cs b/src/Hl7.Fhir.Base/Model/DynamicDataType.cs index 08ad69c137..4c8bbbf7d8 100644 --- a/src/Hl7.Fhir.Base/Model/DynamicDataType.cs +++ b/src/Hl7.Fhir.Base/Model/DynamicDataType.cs @@ -11,8 +11,6 @@ namespace Hl7.Fhir.Model; public interface IDynamicType { public string? DynamicTypeName { get; set; } - - public object this[string key] { get; set; } } /// @@ -26,15 +24,6 @@ public class DynamicDataType : DataType, IDynamicType public string? DynamicTypeName { get; set; } public override string TypeName => DynamicTypeName ?? base.TypeName; - - public void Add(string arg1, object arg2) => this.SetValue(arg1, arg2); - - // TODO: One may wonder whether normal resources should have this as well. - public object this[string key] - { - get => this.AsReadOnlyDictionary()[key]; - set => SetValue(key, value); - } } @@ -50,15 +39,6 @@ public class DynamicResource : Resource, IDynamicType public string? DynamicTypeName { get; set; } public override string TypeName => DynamicTypeName ?? base.TypeName; - - public void Add(string arg1, object arg2) => this.SetValue(arg1, arg2); - - // TODO: One may wonder whether normal resources should have this as well. - public object this[string key] - { - get => this.AsReadOnlyDictionary()[key]; - set => SetValue(key, value); - } } @@ -73,13 +53,4 @@ public class DynamicPrimitive : PrimitiveType, IDynamicType public string? DynamicTypeName { get; set; } public override string TypeName => DynamicTypeName ?? base.TypeName; - - public void Add(string arg1, object arg2) => this.SetValue(arg1, arg2); - - // TODO: One may wonder whether normal resources should have this as well. - public object this[string key] - { - get => this.AsReadOnlyDictionary()[key]; - set => SetValue(key, value); - } } \ No newline at end of file diff --git a/src/Hl7.Fhir.Base/Model/Generated/Attachment.cs b/src/Hl7.Fhir.Base/Model/Generated/Attachment.cs index a40a2431ff..d48efce631 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Attachment.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Attachment.cs @@ -159,14 +159,15 @@ public byte[] Data /// Uri where the data can be found /// [FhirElement("url", InSummary=true, Order=60)] + [DeclaredType(Type = typeof(FhirUrl), Since = FhirRelease.R4)] [DataMember] - public Hl7.Fhir.Model.FhirUrl UrlElement + public Hl7.Fhir.Model.FhirUri UrlElement { get { return _UrlElement; } set { _UrlElement = value; OnPropertyChanged("UrlElement"); } } - private Hl7.Fhir.Model.FhirUrl _UrlElement; + private Hl7.Fhir.Model.FhirUri _UrlElement; /// /// Uri where the data can be found @@ -181,7 +182,7 @@ public string Url if (value == null) UrlElement = null; else - UrlElement = new Hl7.Fhir.Model.FhirUrl(value); + UrlElement = new Hl7.Fhir.Model.FhirUri(value); OnPropertyChanged("Url"); } } @@ -480,7 +481,7 @@ public override IDeepCopyable CopyTo(IDeepCopyable other) if(ContentTypeElement != null) dest.ContentTypeElement = (Hl7.Fhir.Model.Code)ContentTypeElement.DeepCopy(); if(LanguageElement != null) dest.LanguageElement = (Hl7.Fhir.Model.Code)LanguageElement.DeepCopy(); if(DataElement != null) dest.DataElement = (Hl7.Fhir.Model.Base64Binary)DataElement.DeepCopy(); - if(UrlElement != null) dest.UrlElement = (Hl7.Fhir.Model.FhirUrl)UrlElement.DeepCopy(); + if(UrlElement != null) dest.UrlElement = (Hl7.Fhir.Model.FhirUri)UrlElement.DeepCopy(); if(SizeElement != null) dest.SizeElement = (Hl7.Fhir.Model.Integer64)SizeElement.DeepCopy(); if(HashElement != null) dest.HashElement = (Hl7.Fhir.Model.Base64Binary)HashElement.DeepCopy(); if(TitleElement != null) dest.TitleElement = (Hl7.Fhir.Model.FhirString)TitleElement.DeepCopy(); @@ -545,51 +546,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (LanguageElement != null) yield return LanguageElement; - if (DataElement != null) yield return DataElement; - if (UrlElement != null) yield return UrlElement; - if (SizeElement != null) yield return SizeElement; - if (HashElement != null) yield return HashElement; - if (TitleElement != null) yield return TitleElement; - if (CreationElement != null) yield return CreationElement; - if (HeightElement != null) yield return HeightElement; - if (WidthElement != null) yield return WidthElement; - if (FramesElement != null) yield return FramesElement; - if (DurationElement != null) yield return DurationElement; - if (PagesElement != null) yield return PagesElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (DataElement != null) yield return new ElementValue("data", DataElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (SizeElement != null) yield return new ElementValue("size", SizeElement); - if (HashElement != null) yield return new ElementValue("hash", HashElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (CreationElement != null) yield return new ElementValue("creation", CreationElement); - if (HeightElement != null) yield return new ElementValue("height", HeightElement); - if (WidthElement != null) yield return new ElementValue("width", WidthElement); - if (FramesElement != null) yield return new ElementValue("frames", FramesElement); - if (DurationElement != null) yield return new ElementValue("duration", DurationElement); - if (PagesElement != null) yield return new ElementValue("pages", PagesElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -638,7 +595,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -652,7 +609,7 @@ protected override Base SetValue(string key, object value) DataElement = (Hl7.Fhir.Model.Base64Binary)value; return this; case "url": - UrlElement = (Hl7.Fhir.Model.FhirUrl)value; + UrlElement = (Hl7.Fhir.Model.FhirUri)value; return this; case "size": SizeElement = (Hl7.Fhir.Model.Integer64)value; @@ -687,7 +644,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContentTypeElement is not null) yield return new KeyValuePair("contentType",ContentTypeElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/BackboneElement.cs b/src/Hl7.Fhir.Base/Model/Generated/BackboneElement.cs index aa72143c00..896094269a 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/BackboneElement.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/BackboneElement.cs @@ -105,27 +105,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ModifierExtension) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ModifierExtension) { if (elem != null) yield return new ElementValue("modifierExtension", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -138,7 +118,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -151,7 +131,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModifierExtension?.Any() == true) yield return new KeyValuePair("modifierExtension",ModifierExtension); diff --git a/src/Hl7.Fhir.Base/Model/Generated/BackboneType.cs b/src/Hl7.Fhir.Base/Model/Generated/BackboneType.cs index a174b8829f..df8878410c 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/BackboneType.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/BackboneType.cs @@ -105,27 +105,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ModifierExtension) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ModifierExtension) { if (elem != null) yield return new ElementValue("modifierExtension", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -138,7 +118,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -151,7 +131,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModifierExtension?.Any() == true) yield return new KeyValuePair("modifierExtension",ModifierExtension); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Base.cs b/src/Hl7.Fhir.Base/Model/Generated/Base.cs index a90f8d4040..2a8bf0ff25 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Base.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Base.cs @@ -77,27 +77,6 @@ public virtual IDeepCopyable DeepCopy() => public virtual bool IsExactly(IDeepComparable other) => other is Base; - /// - /// Enumerate all child nodes. - /// Return a sequence of child elements, components and/or properties. - /// Child nodes are returned in the order defined by the FHIR specification. - /// First returns child nodes inherited from any base class(es), recursively. - /// Finally returns child nodes defined by the current class. - /// - [IgnoreDataMember] - public virtual IEnumerable Children => Enumerable.Empty(); - - /// - /// Enumerate all child nodes. - /// Return a sequence of child elements, components and/or properties. - /// Child nodes are returned as tuples with the name and the node itself, in the order defined - /// by the FHIR specification. - /// First returns child nodes inherited from any base class(es), recursively. - /// Finally returns child nodes defined by the current class. - /// - [IgnoreDataMember] - public virtual IEnumerable NamedChildren => Enumerable.Empty(); - } } diff --git a/src/Hl7.Fhir.Base/Model/Generated/Binary.cs b/src/Hl7.Fhir.Base/Model/Generated/Binary.cs index 911bd9d092..03253174b5 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Binary.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Binary.cs @@ -225,33 +225,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (SecurityContext != null) yield return SecurityContext; - if (ContentElement != null) yield return ContentElement; - if (DataElement != null) yield return DataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (SecurityContext != null) yield return new ElementValue("securityContext", SecurityContext); - if (ContentElement != null) yield return new ElementValue("content", ContentElement); - if (DataElement != null) yield return new ElementValue("data", DataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -273,7 +247,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -295,7 +269,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContentTypeElement is not null) yield return new KeyValuePair("contentType",ContentTypeElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs b/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs index 793a725615..49b937a47b 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Bundle.cs @@ -1063,29 +1063,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RelationElement != null) yield return RelationElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RelationElement != null) yield return new ElementValue("relation", RelationElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1101,7 +1079,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1117,7 +1095,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RelationElement is not null) yield return new KeyValuePair("relation",RelationElement); @@ -1298,37 +1276,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Link) { if (elem != null) yield return elem; } - if (FullUrlElement != null) yield return FullUrlElement; - if (Resource != null) yield return Resource; - if (Search != null) yield return Search; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - if (FullUrlElement != null) yield return new ElementValue("fullUrl", FullUrlElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - if (Search != null) yield return new ElementValue("search", Search); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1356,7 +1304,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1384,7 +1332,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Link?.Any() == true) yield return new KeyValuePair("link",Link); @@ -1522,29 +1470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (ScoreElement != null) yield return ScoreElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (ScoreElement != null) yield return new ElementValue("score", ScoreElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1560,7 +1486,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1576,7 +1502,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -1848,37 +1774,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MethodElement != null) yield return MethodElement; - if (UrlElement != null) yield return UrlElement; - if (IfNoneMatchElement != null) yield return IfNoneMatchElement; - if (IfModifiedSinceElement != null) yield return IfModifiedSinceElement; - if (IfMatchElement != null) yield return IfMatchElement; - if (IfNoneExistElement != null) yield return IfNoneExistElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MethodElement != null) yield return new ElementValue("method", MethodElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (IfNoneMatchElement != null) yield return new ElementValue("ifNoneMatch", IfNoneMatchElement); - if (IfModifiedSinceElement != null) yield return new ElementValue("ifModifiedSince", IfModifiedSinceElement); - if (IfMatchElement != null) yield return new ElementValue("ifMatch", IfMatchElement); - if (IfNoneExistElement != null) yield return new ElementValue("ifNoneExist", IfNoneExistElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1906,7 +1802,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1934,7 +1830,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MethodElement is not null) yield return new KeyValuePair("method",MethodElement); @@ -2157,35 +2053,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (LocationElement != null) yield return LocationElement; - if (EtagElement != null) yield return EtagElement; - if (LastModifiedElement != null) yield return LastModifiedElement; - if (Outcome != null) yield return Outcome; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (LocationElement != null) yield return new ElementValue("location", LocationElement); - if (EtagElement != null) yield return new ElementValue("etag", EtagElement); - if (LastModifiedElement != null) yield return new ElementValue("lastModified", LastModifiedElement); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2210,7 +2078,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2235,7 +2103,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); @@ -2477,41 +2345,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (TypeElement != null) yield return TypeElement; - if (TimestampElement != null) yield return TimestampElement; - if (TotalElement != null) yield return TotalElement; - foreach (var elem in Link) { if (elem != null) yield return elem; } - foreach (var elem in Entry) { if (elem != null) yield return elem; } - if (Signature != null) yield return Signature; - if (Issues != null) yield return Issues; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TimestampElement != null) yield return new ElementValue("timestamp", TimestampElement); - if (TotalElement != null) yield return new ElementValue("total", TotalElement); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - if (Signature != null) yield return new ElementValue("signature", Signature); - if (Issues != null) yield return new ElementValue("issues", Issues); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2545,7 +2379,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2579,7 +2413,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.Base/Model/Generated/CodeableConcept.cs b/src/Hl7.Fhir.Base/Model/Generated/CodeableConcept.cs index 9825ebe1cc..4a5bf3dc4a 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/CodeableConcept.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/CodeableConcept.cs @@ -150,29 +150,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Coding) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Coding) { if (elem != null) yield return new ElementValue("coding", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -188,7 +166,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -204,7 +182,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coding?.Any() == true) yield return new KeyValuePair("coding",Coding); diff --git a/src/Hl7.Fhir.Base/Model/Generated/CodeableReference.cs b/src/Hl7.Fhir.Base/Model/Generated/CodeableReference.cs index 433875d3d2..297fa81d98 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/CodeableReference.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/CodeableReference.cs @@ -130,29 +130,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Concept != null) yield return Concept; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Concept != null) yield return new ElementValue("concept", Concept); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -168,7 +146,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -184,7 +162,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Concept is not null) yield return new KeyValuePair("concept",Concept); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Coding.cs b/src/Hl7.Fhir.Base/Model/Generated/Coding.cs index 9764a76469..705959f2f4 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Coding.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Coding.cs @@ -268,35 +268,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemElement != null) yield return SystemElement; - if (VersionElement != null) yield return VersionElement; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (UserSelectedElement != null) yield return UserSelectedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (UserSelectedElement != null) yield return new ElementValue("userSelected", UserSelectedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -321,7 +293,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -346,7 +318,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemElement is not null) yield return new KeyValuePair("system",SystemElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/ContactDetail.cs b/src/Hl7.Fhir.Base/Model/Generated/ContactDetail.cs index 9a7fefd46f..9c0b392cc0 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/ContactDetail.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/ContactDetail.cs @@ -149,29 +149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -187,7 +165,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -203,7 +181,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/ContactPoint.cs b/src/Hl7.Fhir.Base/Model/Generated/ContactPoint.cs index 584e785012..db5973433d 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/ContactPoint.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/ContactPoint.cs @@ -346,35 +346,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemElement != null) yield return SystemElement; - if (ValueElement != null) yield return ValueElement; - if (UseElement != null) yield return UseElement; - if (RankElement != null) yield return RankElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (RankElement != null) yield return new ElementValue("rank", RankElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -399,7 +371,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -424,7 +396,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemElement is not null) yield return new KeyValuePair("system",SystemElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs b/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs index 576631b9eb..0174e8bcc5 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/DomainResource.cs @@ -157,33 +157,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Text != null) yield return Text; - foreach (var elem in Contained) { if (elem != null) yield return elem; } - foreach (var elem in Extension) { if (elem != null) yield return elem; } - foreach (var elem in ModifierExtension) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Text != null) yield return new ElementValue("text", Text); - foreach (var elem in Contained) { if (elem != null) yield return new ElementValue("contained", elem); } - foreach (var elem in Extension) { if (elem != null) yield return new ElementValue("extension", elem); } - foreach (var elem in ModifierExtension) { if (elem != null) yield return new ElementValue("modifierExtension", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -205,7 +179,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -227,7 +201,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Text is not null) yield return new KeyValuePair("text",Text); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Element.cs b/src/Hl7.Fhir.Base/Model/Generated/Element.cs index 0fcbbe6c00..52eb68a0b7 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Element.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Element.cs @@ -122,29 +122,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ElementId != null) yield return new FhirString(ElementId); - foreach (var elem in Extension) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ElementId != null) yield return new ElementValue("id", new FhirString(ElementId)); - foreach (var elem in Extension) { if (elem != null) yield return new ElementValue("extension", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -160,7 +138,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -176,7 +154,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ElementId is not null) yield return new KeyValuePair("id",ElementId); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Extension.cs b/src/Hl7.Fhir.Base/Model/Generated/Extension.cs index 24a52096a4..0fde7c026c 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Extension.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Extension.cs @@ -133,29 +133,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Url != null) yield return new FhirUri(Url); - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Url != null) yield return new ElementValue("url", new FhirUri(Url)); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -171,7 +149,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -187,7 +165,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Url is not null) yield return new KeyValuePair("url",Url); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Identifier.cs b/src/Hl7.Fhir.Base/Model/Generated/Identifier.cs index 9badd7daf7..9a67ff9c19 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Identifier.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Identifier.cs @@ -294,37 +294,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (Type != null) yield return Type; - if (SystemElement != null) yield return SystemElement; - if (ValueElement != null) yield return ValueElement; - if (Period != null) yield return Period; - if (Assigner != null) yield return Assigner; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Assigner != null) yield return new ElementValue("assigner", Assigner); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -352,7 +322,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -380,7 +350,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Meta.cs b/src/Hl7.Fhir.Base/Model/Generated/Meta.cs index b45fb8753e..13c82f149c 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Meta.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Meta.cs @@ -272,37 +272,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VersionIdElement != null) yield return VersionIdElement; - if (LastUpdatedElement != null) yield return LastUpdatedElement; - if (SourceElement != null) yield return SourceElement; - foreach (var elem in ProfileElement) { if (elem != null) yield return elem; } - foreach (var elem in Security) { if (elem != null) yield return elem; } - foreach (var elem in Tag) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VersionIdElement != null) yield return new ElementValue("versionId", VersionIdElement); - if (LastUpdatedElement != null) yield return new ElementValue("lastUpdated", LastUpdatedElement); - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - foreach (var elem in ProfileElement) { if (elem != null) yield return new ElementValue("profile", elem); } - foreach (var elem in Security) { if (elem != null) yield return new ElementValue("security", elem); } - foreach (var elem in Tag) { if (elem != null) yield return new ElementValue("tag", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -330,7 +300,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -358,7 +328,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VersionIdElement is not null) yield return new KeyValuePair("versionId",VersionIdElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Narrative.cs b/src/Hl7.Fhir.Base/Model/Generated/Narrative.cs index d42405c0e5..1906d7526b 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Narrative.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Narrative.cs @@ -204,29 +204,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (DivElement != null) yield return new FhirString(DivElement.Value); - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DivElement != null) yield return new ElementValue("div", new FhirString(DivElement.Value)); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -242,7 +220,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -258,7 +236,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs b/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs index a50383dd61..c37bdc3fef 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/OperationOutcome.cs @@ -559,37 +559,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SeverityElement != null) yield return SeverityElement; - if (CodeElement != null) yield return CodeElement; - if (Details != null) yield return Details; - if (DiagnosticsElement != null) yield return DiagnosticsElement; - foreach (var elem in LocationElement) { if (elem != null) yield return elem; } - foreach (var elem in ExpressionElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Details != null) yield return new ElementValue("details", Details); - if (DiagnosticsElement != null) yield return new ElementValue("diagnostics", DiagnosticsElement); - foreach (var elem in LocationElement) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in ExpressionElement) { if (elem != null) yield return new ElementValue("expression", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -617,7 +587,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -645,7 +615,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SeverityElement is not null) yield return new KeyValuePair("severity",SeverityElement); @@ -714,27 +684,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Issue) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Issue) { if (elem != null) yield return new ElementValue("issue", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -747,7 +697,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -760,7 +710,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Issue?.Any() == true) yield return new KeyValuePair("issue",Issue); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs b/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs index 03e70f9f40..d4b7e7a2dd 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Parameters.cs @@ -201,33 +201,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Value != null) yield return Value; - if (Resource != null) yield return Resource; - foreach (var elem in Part) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Value != null) yield return new ElementValue("value", Value); - if (Resource != null) yield return new ElementValue("resource", Resource); - foreach (var elem in Part) { if (elem != null) yield return new ElementValue("part", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -249,7 +223,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -271,7 +245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -338,27 +312,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -371,7 +325,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -384,7 +338,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Parameter?.Any() == true) yield return new KeyValuePair("parameter",Parameter); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Period.cs b/src/Hl7.Fhir.Base/Model/Generated/Period.cs index 32425c64cb..90c1d95fa4 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Period.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Period.cs @@ -168,29 +168,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -206,7 +184,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -222,7 +200,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StartElement is not null) yield return new KeyValuePair("start",StartElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Quantity.cs b/src/Hl7.Fhir.Base/Model/Generated/Quantity.cs index 4adf5780a9..3f65975ead 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Quantity.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Quantity.cs @@ -311,35 +311,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ValueElement != null) yield return ValueElement; - if (ComparatorElement != null) yield return ComparatorElement; - if (UnitElement != null) yield return UnitElement; - if (SystemElement != null) yield return SystemElement; - if (CodeElement != null) yield return CodeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (ComparatorElement != null) yield return new ElementValue("comparator", ComparatorElement); - if (UnitElement != null) yield return new ElementValue("unit", UnitElement); - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -364,7 +336,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -389,7 +361,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ValueElement is not null) yield return new KeyValuePair("value",ValueElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Range.cs b/src/Hl7.Fhir.Base/Model/Generated/Range.cs index 4040a28498..7f9f91421a 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Range.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Range.cs @@ -131,29 +131,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Low != null) yield return Low; - if (High != null) yield return High; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Low != null) yield return new ElementValue("low", Low); - if (High != null) yield return new ElementValue("high", High); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -169,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -185,7 +163,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Low is not null) yield return new KeyValuePair("low",Low); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Resource.cs b/src/Hl7.Fhir.Base/Model/Generated/Resource.cs index 216336e366..caaae2209e 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Resource.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Resource.cs @@ -207,33 +207,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdElement != null) yield return IdElement; - if (Meta != null) yield return Meta; - if (ImplicitRulesElement != null) yield return ImplicitRulesElement; - if (LanguageElement != null) yield return LanguageElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdElement != null) yield return new ElementValue("id", IdElement); - if (Meta != null) yield return new ElementValue("meta", Meta); - if (ImplicitRulesElement != null) yield return new ElementValue("implicitRules", ImplicitRulesElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -255,7 +229,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -277,7 +251,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdElement is not null) yield return new KeyValuePair("id",IdElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/ResourceReference.cs b/src/Hl7.Fhir.Base/Model/Generated/ResourceReference.cs index ff20cdf08a..6653716497 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/ResourceReference.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/ResourceReference.cs @@ -217,33 +217,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ReferenceElement != null) yield return ReferenceElement; - if (TypeElement != null) yield return TypeElement; - if (Identifier != null) yield return Identifier; - if (DisplayElement != null) yield return DisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -265,7 +239,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -287,7 +261,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ReferenceElement is not null) yield return new KeyValuePair("reference",ReferenceElement); diff --git a/src/Hl7.Fhir.Base/Model/Generated/Signature.cs b/src/Hl7.Fhir.Base/Model/Generated/Signature.cs index 1df5c4dfa8..8be71a802a 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/Signature.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/Signature.cs @@ -375,43 +375,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (WhenElement != null) yield return WhenElement; - if (Who != null) yield return Who; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (TargetFormatElement != null) yield return TargetFormatElement; - if (SigFormatElement != null) yield return SigFormatElement; - if (BlobElement != null) yield return BlobElement; - if (DataElement != null) yield return DataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (WhenElement != null) yield return new ElementValue("when", WhenElement); - if (Who != null) yield return new ElementValue("who", Who); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (TargetFormatElement != null) yield return new ElementValue("targetFormat", TargetFormatElement); - if (SigFormatElement != null) yield return new ElementValue("sigFormat", SigFormatElement); - if (BlobElement != null) yield return new ElementValue("blob", BlobElement); - if (DataElement != null) yield return new ElementValue("data", DataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -448,7 +412,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -485,7 +449,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); diff --git a/src/Hl7.Fhir.Base/Model/Generated/UsageContext.cs b/src/Hl7.Fhir.Base/Model/Generated/UsageContext.cs index 0a3dd0fe30..bc541e1b0c 100644 --- a/src/Hl7.Fhir.Base/Model/Generated/UsageContext.cs +++ b/src/Hl7.Fhir.Base/Model/Generated/UsageContext.cs @@ -137,29 +137,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -175,7 +153,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -191,7 +169,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); diff --git a/src/Hl7.Fhir.Base/Model/PrimitiveType.cs b/src/Hl7.Fhir.Base/Model/PrimitiveType.cs index 679336df7c..03ce85beca 100644 --- a/src/Hl7.Fhir.Base/Model/PrimitiveType.cs +++ b/src/Hl7.Fhir.Base/Model/PrimitiveType.cs @@ -58,7 +58,7 @@ protected virtual void OnObjectValueChanged() } /// - protected override bool TryGetValue(string key, [NotNullWhen(true)] out object? value) + internal protected override bool TryGetValue(string key, [NotNullWhen(true)] out object? value) { if (key == "value") { @@ -69,7 +69,7 @@ protected override bool TryGetValue(string key, [NotNullWhen(true)] out object? return base.TryGetValue(key, out value); } - protected override Base SetValue(string key, object? value) + internal protected override Base SetValue(string key, object? value) { switch (key) { @@ -81,7 +81,7 @@ protected override Base SetValue(string key, object? value) } } /// - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { if (ObjectValue is not null) yield return new KeyValuePair("value", ObjectValue); foreach (var kvp in base.GetElementPairs()) yield return kvp; diff --git a/src/Hl7.Fhir.Base/Rest/BaseFhirClient.cs b/src/Hl7.Fhir.Base/Rest/BaseFhirClient.cs index 251825a6ba..7875c314c6 100644 --- a/src/Hl7.Fhir.Base/Rest/BaseFhirClient.cs +++ b/src/Hl7.Fhir.Base/Rest/BaseFhirClient.cs @@ -1020,7 +1020,8 @@ private async Task verifyServerVersion(CancellationToken ct) var capabilityStatement = await executeAsync(tx, HttpStatusCode.OK, ct).ConfigureAwait(false); if (capabilityStatement is null) return null; - return capabilityStatement.AsReadOnlyDictionary().TryGetValue("fhirVersion", out var value) && value is PrimitiveType pt && pt.ObjectValue is string version + return capabilityStatement.TryGetValue("fhirVersion", out var value) && + value is PrimitiveType { ObjectValue: string version } ? version : null; } diff --git a/src/Hl7.Fhir.Base/Serialization/BaseFhirJsonPocoSerializer.cs b/src/Hl7.Fhir.Base/Serialization/BaseFhirJsonPocoSerializer.cs index caedb9f664..18780b92bb 100644 --- a/src/Hl7.Fhir.Base/Serialization/BaseFhirJsonPocoSerializer.cs +++ b/src/Hl7.Fhir.Base/Serialization/BaseFhirJsonPocoSerializer.cs @@ -98,7 +98,7 @@ private void serializeInternal( filter?.EnterObject(element, mapping); - foreach (var member in element) + foreach (var member in element.GetElementPairs()) { if (skipValue && member.Key == "value") continue; diff --git a/src/Hl7.Fhir.Base/Serialization/BaseFhirSerializer.cs b/src/Hl7.Fhir.Base/Serialization/BaseFhirSerializer.cs index 3fa8d72c95..b4078da058 100644 --- a/src/Hl7.Fhir.Base/Serialization/BaseFhirSerializer.cs +++ b/src/Hl7.Fhir.Base/Serialization/BaseFhirSerializer.cs @@ -82,7 +82,9 @@ private void addSubsetted(Base instance, bool atRoot) } } - foreach (var child in instance.Children) +#pragma warning disable CS0618 // Type or member is obsolete + foreach (var child in instance.Children()) +#pragma warning restore CS0618 // Type or member is obsolete addSubsetted(child, atRoot: false); } } diff --git a/src/Hl7.Fhir.Base/Serialization/BaseFhirXmlPocoSerializer.cs b/src/Hl7.Fhir.Base/Serialization/BaseFhirXmlPocoSerializer.cs index 37b4091342..a6bf8d6134 100644 --- a/src/Hl7.Fhir.Base/Serialization/BaseFhirXmlPocoSerializer.cs +++ b/src/Hl7.Fhir.Base/Serialization/BaseFhirXmlPocoSerializer.cs @@ -107,6 +107,7 @@ private void serializeElement(Base element, XmlWriter writer, SerializationFilte { // Make sure that elements with attributes are serialized first. var orderedMembers = element + .GetElementPairs() .Select(m => (m, mapping: mapping?.FindMappedElementByName(m.Key))) .OrderBy(p => p.mapping?.SerializationHint != XmlRepresentation.XmlAttr); diff --git a/src/Hl7.Fhir.Base/Specification/Snapshot/SnapshotGeneratorExtensions.cs b/src/Hl7.Fhir.Base/Specification/Snapshot/SnapshotGeneratorExtensions.cs index 3cd2cb0abb..20bdc6b445 100644 --- a/src/Hl7.Fhir.Base/Specification/Snapshot/SnapshotGeneratorExtensions.cs +++ b/src/Hl7.Fhir.Base/Specification/Snapshot/SnapshotGeneratorExtensions.cs @@ -59,7 +59,7 @@ public static void RemoveAllConstrainedByDiffExtensions(this Element element) { if (element == null) { throw Error.ArgumentNull(nameof(element)); } element.RemoveConstrainedByDiffExtension(); - foreach (var child in element.Children.OfType()) + foreach (var child in element.Children().OfType()) { child.RemoveAllConstrainedByDiffExtensions(); } @@ -81,7 +81,9 @@ internal static void RemoveAllNonInheritableExtensions(this Element element) { if (element == null) { throw Error.ArgumentNull(nameof(element)); } element.RemoveNonInheritableExtensions(); - foreach (var child in element.Children.OfType()) +#pragma warning disable CS0618 // Type or member is obsolete + foreach (var child in element.Children().OfType()) +#pragma warning restore CS0618 // Type or member is obsolete { child.RemoveAllNonInheritableExtensions(); } @@ -159,4 +161,4 @@ static void ClearExtension(this IExtendable extendable, string uri) #endif } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Base/Utility/NullExtensions.cs b/src/Hl7.Fhir.Base/Utility/NullExtensions.cs index cea6a54319..1cb9d1a324 100644 --- a/src/Hl7.Fhir.Base/Utility/NullExtensions.cs +++ b/src/Hl7.Fhir.Base/Utility/NullExtensions.cs @@ -14,8 +14,6 @@ namespace Hl7.Fhir.Utility { public static class NullExtensions { - // Note: argument needs to be strongly typed (List, not IList) in order to prevent resolving conflicts with generic method below - /// Determines if the list is null or empty. public static bool IsNullOrEmpty(this IList list) => list == null || list.Count == 0; @@ -23,18 +21,19 @@ public static class NullExtensions /// Determines if the element is null or empty. /// For primitive values, verifies that the value equals null. /// For primitive string values, verifies that the string value is null or empty. - /// Recursively verifies that all instances are null or empty. + /// Recursively verifies that all child elements are null or empty. /// - public static bool IsNullOrEmpty(this Base element) { if (element == null) { return true; } var isEmpty = element is IValue ss ? string.IsNullOrEmpty(ss.Value) - : !(element is PrimitiveType pp) || pp.ObjectValue == null; + : element is not PrimitiveType pp || pp.ObjectValue == null; // Note: Children collection includes extensions - return isEmpty && !element.Children.Any(c => !c.IsNullOrEmpty()); +#pragma warning disable CS0618 // Type or member is obsolete + return isEmpty && element.Children().All(c => c.IsNullOrEmpty()); +#pragma warning restore CS0618 // Type or member is obsolete } } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs b/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs index edc3979a16..545341b383 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/CapabilityStatement.cs @@ -512,31 +512,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (VersionElement != null) yield return VersionElement; - if (ReleaseDateElement != null) yield return ReleaseDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (ReleaseDateElement != null) yield return new ElementValue("releaseDate", ReleaseDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -555,7 +531,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -574,7 +550,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -728,31 +704,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (UrlElement != null) yield return UrlElement; - if (Custodian != null) yield return Custodian; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -771,7 +723,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -790,7 +742,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1046,41 +998,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (Security != null) yield return Security; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - foreach (var elem in Interaction) { if (elem != null) yield return elem; } - foreach (var elem in SearchParam) { if (elem != null) yield return elem; } - foreach (var elem in Operation) { if (elem != null) yield return elem; } - foreach (var elem in CompartmentElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (Security != null) yield return new ElementValue("security", Security); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - foreach (var elem in Interaction) { if (elem != null) yield return new ElementValue("interaction", elem); } - foreach (var elem in SearchParam) { if (elem != null) yield return new ElementValue("searchParam", elem); } - foreach (var elem in Operation) { if (elem != null) yield return new ElementValue("operation", elem); } - foreach (var elem in CompartmentElement) { if (elem != null) yield return new ElementValue("compartment", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1114,7 +1032,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1148,7 +1066,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -1304,31 +1222,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CorsElement != null) yield return CorsElement; - foreach (var elem in Service) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CorsElement != null) yield return new ElementValue("cors", CorsElement); - foreach (var elem in Service) { if (elem != null) yield return new ElementValue("service", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1347,7 +1241,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1366,7 +1260,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CorsElement is not null) yield return new KeyValuePair("cors",CorsElement); @@ -2007,61 +1901,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ProfileElement != null) yield return ProfileElement; - foreach (var elem in SupportedProfileElement) { if (elem != null) yield return elem; } - if (DocumentationElement != null) yield return DocumentationElement; - foreach (var elem in Interaction) { if (elem != null) yield return elem; } - if (VersioningElement != null) yield return VersioningElement; - if (ReadHistoryElement != null) yield return ReadHistoryElement; - if (UpdateCreateElement != null) yield return UpdateCreateElement; - if (ConditionalCreateElement != null) yield return ConditionalCreateElement; - if (ConditionalReadElement != null) yield return ConditionalReadElement; - if (ConditionalUpdateElement != null) yield return ConditionalUpdateElement; - if (ConditionalPatchElement != null) yield return ConditionalPatchElement; - if (ConditionalDeleteElement != null) yield return ConditionalDeleteElement; - foreach (var elem in ReferencePolicyElement) { if (elem != null) yield return elem; } - foreach (var elem in SearchIncludeElement) { if (elem != null) yield return elem; } - foreach (var elem in SearchRevIncludeElement) { if (elem != null) yield return elem; } - foreach (var elem in SearchParam) { if (elem != null) yield return elem; } - foreach (var elem in Operation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - foreach (var elem in SupportedProfileElement) { if (elem != null) yield return new ElementValue("supportedProfile", elem); } - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - foreach (var elem in Interaction) { if (elem != null) yield return new ElementValue("interaction", elem); } - if (VersioningElement != null) yield return new ElementValue("versioning", VersioningElement); - if (ReadHistoryElement != null) yield return new ElementValue("readHistory", ReadHistoryElement); - if (UpdateCreateElement != null) yield return new ElementValue("updateCreate", UpdateCreateElement); - if (ConditionalCreateElement != null) yield return new ElementValue("conditionalCreate", ConditionalCreateElement); - if (ConditionalReadElement != null) yield return new ElementValue("conditionalRead", ConditionalReadElement); - if (ConditionalUpdateElement != null) yield return new ElementValue("conditionalUpdate", ConditionalUpdateElement); - if (ConditionalPatchElement != null) yield return new ElementValue("conditionalPatch", ConditionalPatchElement); - if (ConditionalDeleteElement != null) yield return new ElementValue("conditionalDelete", ConditionalDeleteElement); - foreach (var elem in ReferencePolicyElement) { if (elem != null) yield return new ElementValue("referencePolicy", elem); } - foreach (var elem in SearchIncludeElement) { if (elem != null) yield return new ElementValue("searchInclude", elem); } - foreach (var elem in SearchRevIncludeElement) { if (elem != null) yield return new ElementValue("searchRevInclude", elem); } - foreach (var elem in SearchParam) { if (elem != null) yield return new ElementValue("searchParam", elem); } - foreach (var elem in Operation) { if (elem != null) yield return new ElementValue("operation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2125,7 +1965,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2189,7 +2029,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2341,29 +2181,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2379,7 +2197,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2395,7 +2213,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -2600,33 +2418,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DefinitionElement != null) yield return DefinitionElement; - if (TypeElement != null) yield return TypeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2648,7 +2440,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2670,7 +2462,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2842,31 +2634,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DefinitionElement != null) yield return DefinitionElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2885,7 +2653,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2904,7 +2672,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -3040,29 +2808,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3078,7 +2824,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3094,7 +2840,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -3261,33 +3007,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (ReliableCacheElement != null) yield return ReliableCacheElement; - if (DocumentationElement != null) yield return DocumentationElement; - foreach (var elem in SupportedMessage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (ReliableCacheElement != null) yield return new ElementValue("reliableCache", ReliableCacheElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - foreach (var elem in SupportedMessage) { if (elem != null) yield return new ElementValue("supportedMessage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3309,7 +3029,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3331,7 +3051,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Endpoint?.Any() == true) yield return new KeyValuePair("endpoint",Endpoint); @@ -3450,29 +3170,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Protocol != null) yield return Protocol; - if (AddressElement != null) yield return AddressElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Protocol != null) yield return new ElementValue("protocol", Protocol); - if (AddressElement != null) yield return new ElementValue("address", AddressElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3488,7 +3186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3504,7 +3202,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Protocol is not null) yield return new KeyValuePair("protocol",Protocol); @@ -3641,29 +3339,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (DefinitionElement != null) yield return DefinitionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3679,7 +3355,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3695,7 +3371,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -3865,31 +3541,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (ProfileElement != null) yield return ProfileElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3908,7 +3560,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3927,7 +3579,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -4847,85 +4499,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (KindElement != null) yield return KindElement; - foreach (var elem in InstantiatesElement) { if (elem != null) yield return elem; } - foreach (var elem in ImportsElement) { if (elem != null) yield return elem; } - if (Software != null) yield return Software; - if (Implementation != null) yield return Implementation; - if (FhirVersionElement != null) yield return FhirVersionElement; - foreach (var elem in FormatElement) { if (elem != null) yield return elem; } - foreach (var elem in PatchFormatElement) { if (elem != null) yield return elem; } - foreach (var elem in AcceptLanguageElement) { if (elem != null) yield return elem; } - foreach (var elem in ImplementationGuideElement) { if (elem != null) yield return elem; } - foreach (var elem in Rest) { if (elem != null) yield return elem; } - foreach (var elem in Messaging) { if (elem != null) yield return elem; } - foreach (var elem in Document) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - foreach (var elem in InstantiatesElement) { if (elem != null) yield return new ElementValue("instantiates", elem); } - foreach (var elem in ImportsElement) { if (elem != null) yield return new ElementValue("imports", elem); } - if (Software != null) yield return new ElementValue("software", Software); - if (Implementation != null) yield return new ElementValue("implementation", Implementation); - if (FhirVersionElement != null) yield return new ElementValue("fhirVersion", FhirVersionElement); - foreach (var elem in FormatElement) { if (elem != null) yield return new ElementValue("format", elem); } - foreach (var elem in PatchFormatElement) { if (elem != null) yield return new ElementValue("patchFormat", elem); } - foreach (var elem in AcceptLanguageElement) { if (elem != null) yield return new ElementValue("acceptLanguage", elem); } - foreach (var elem in ImplementationGuideElement) { if (elem != null) yield return new ElementValue("implementationGuide", elem); } - foreach (var elem in Rest) { if (elem != null) yield return new ElementValue("rest", elem); } - foreach (var elem in Messaging) { if (elem != null) yield return new ElementValue("messaging", elem); } - foreach (var elem in Document) { if (elem != null) yield return new ElementValue("document", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5025,7 +4599,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5125,7 +4699,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs b/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs index 6c4761bdf8..8266896c2b 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/CodeSystem.cs @@ -342,33 +342,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in OperatorElement) { if (elem != null) yield return elem; } - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in OperatorElement) { if (elem != null) yield return new ElementValue("operator", elem); } - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -390,7 +364,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -412,7 +386,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -619,33 +593,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (UriElement != null) yield return UriElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -667,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -689,7 +637,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -910,37 +858,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (DefinitionElement != null) yield return DefinitionElement; - foreach (var elem in Designation) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in Concept) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - foreach (var elem in Designation) { if (elem != null) yield return new ElementValue("designation", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in Concept) { if (elem != null) yield return new ElementValue("concept", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -968,7 +886,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -996,7 +914,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1170,33 +1088,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LanguageElement != null) yield return LanguageElement; - if (Use != null) yield return Use; - foreach (var elem in AdditionalUse) { if (elem != null) yield return elem; } - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (Use != null) yield return new ElementValue("use", Use); - foreach (var elem in AdditionalUse) { if (elem != null) yield return new ElementValue("additionalUse", elem); } - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1218,7 +1110,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1240,7 +1132,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LanguageElement is not null) yield return new KeyValuePair("language",LanguageElement); @@ -1360,29 +1252,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1398,7 +1268,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1414,7 +1284,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -2477,99 +2347,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (CaseSensitiveElement != null) yield return CaseSensitiveElement; - if (ValueSetElement != null) yield return ValueSetElement; - if (HierarchyMeaningElement != null) yield return HierarchyMeaningElement; - if (CompositionalElement != null) yield return CompositionalElement; - if (VersionNeededElement != null) yield return VersionNeededElement; - if (ContentElement != null) yield return ContentElement; - if (SupplementsElement != null) yield return SupplementsElement; - if (CountElement != null) yield return CountElement; - foreach (var elem in Filter) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in Concept) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (CaseSensitiveElement != null) yield return new ElementValue("caseSensitive", CaseSensitiveElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - if (HierarchyMeaningElement != null) yield return new ElementValue("hierarchyMeaning", HierarchyMeaningElement); - if (CompositionalElement != null) yield return new ElementValue("compositional", CompositionalElement); - if (VersionNeededElement != null) yield return new ElementValue("versionNeeded", VersionNeededElement); - if (ContentElement != null) yield return new ElementValue("content", ContentElement); - if (SupplementsElement != null) yield return new ElementValue("supplements", SupplementsElement); - if (CountElement != null) yield return new ElementValue("count", CountElement); - foreach (var elem in Filter) { if (elem != null) yield return new ElementValue("filter", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in Concept) { if (elem != null) yield return new ElementValue("concept", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2690,7 +2468,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2811,7 +2589,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs b/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs index 07c4c86a1a..9f0c728dfa 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/ElementDefinition.cs @@ -478,33 +478,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Discriminator) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (OrderedElement != null) yield return OrderedElement; - if (RulesElement != null) yield return RulesElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Discriminator) { if (elem != null) yield return new ElementValue("discriminator", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (OrderedElement != null) yield return new ElementValue("ordered", OrderedElement); - if (RulesElement != null) yield return new ElementValue("rules", RulesElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -526,7 +500,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -548,7 +522,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Discriminator?.Any() == true) yield return new KeyValuePair("discriminator",Discriminator); @@ -687,29 +661,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (PathElement != null) yield return PathElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -725,7 +677,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -741,7 +693,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -911,31 +863,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -954,7 +882,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -973,7 +901,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -1218,35 +1146,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in ProfileElement) { if (elem != null) yield return elem; } - foreach (var elem in TargetProfileElement) { if (elem != null) yield return elem; } - foreach (var elem in AggregationElement) { if (elem != null) yield return elem; } - if (VersioningElement != null) yield return VersioningElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in ProfileElement) { if (elem != null) yield return new ElementValue("profile", elem); } - foreach (var elem in TargetProfileElement) { if (elem != null) yield return new ElementValue("targetProfile", elem); } - foreach (var elem in AggregationElement) { if (elem != null) yield return new ElementValue("aggregation", elem); } - if (VersioningElement != null) yield return new ElementValue("versioning", VersioningElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1271,7 +1171,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1296,7 +1196,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1416,29 +1316,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LabelElement != null) yield return LabelElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1454,7 +1332,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1470,7 +1348,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LabelElement is not null) yield return new KeyValuePair("label",LabelElement); @@ -1815,41 +1693,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KeyElement != null) yield return KeyElement; - if (RequirementsElement != null) yield return RequirementsElement; - if (SeverityElement != null) yield return SeverityElement; - if (SuppressElement != null) yield return SuppressElement; - if (HumanElement != null) yield return HumanElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (XpathElement != null) yield return XpathElement; - if (SourceElement != null) yield return SourceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KeyElement != null) yield return new ElementValue("key", KeyElement); - if (RequirementsElement != null) yield return new ElementValue("requirements", RequirementsElement); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (SuppressElement != null) yield return new ElementValue("suppress", SuppressElement); - if (HumanElement != null) yield return new ElementValue("human", HumanElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (XpathElement != null) yield return new ElementValue("xpath", XpathElement); - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1883,7 +1727,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1917,7 +1761,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KeyElement is not null) yield return new KeyValuePair("key",KeyElement); @@ -2112,33 +1956,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StrengthElement != null) yield return StrengthElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (ValueSetElement != null) yield return ValueSetElement; - foreach (var elem in Additional) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StrengthElement != null) yield return new ElementValue("strength", StrengthElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - foreach (var elem in Additional) { if (elem != null) yield return new ElementValue("additional", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2160,7 +1978,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2182,7 +2000,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StrengthElement is not null) yield return new KeyValuePair("strength",StrengthElement); @@ -2439,37 +2257,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PurposeElement != null) yield return PurposeElement; - if (ValueSetElement != null) yield return ValueSetElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (ShortDocoElement != null) yield return ShortDocoElement; - foreach (var elem in Usage) { if (elem != null) yield return elem; } - if (AnyElement != null) yield return AnyElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (ShortDocoElement != null) yield return new ElementValue("shortDoco", ShortDocoElement); - foreach (var elem in Usage) { if (elem != null) yield return new ElementValue("usage", elem); } - if (AnyElement != null) yield return new ElementValue("any", AnyElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2497,7 +2285,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2525,7 +2313,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PurposeElement is not null) yield return new KeyValuePair("purpose",PurposeElement); @@ -2735,33 +2523,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentityElement != null) yield return IdentityElement; - if (LanguageElement != null) yield return LanguageElement; - if (MapElement != null) yield return MapElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentityElement != null) yield return new ElementValue("identity", IdentityElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (MapElement != null) yield return new ElementValue("map", MapElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2783,7 +2545,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2805,7 +2567,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentityElement is not null) yield return new KeyValuePair("identity",IdentityElement); @@ -3862,97 +3624,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - foreach (var elem in RepresentationElement) { if (elem != null) yield return elem; } - if (SliceNameElement != null) yield return SliceNameElement; - if (SliceIsConstrainingElement != null) yield return SliceIsConstrainingElement; - if (LabelElement != null) yield return LabelElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (Slicing != null) yield return Slicing; - if (ShortElement != null) yield return ShortElement; - if (DefinitionElement != null) yield return DefinitionElement; - if (CommentElement != null) yield return CommentElement; - if (RequirementsElement != null) yield return RequirementsElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (Base != null) yield return Base; - if (ContentReferenceElement != null) yield return ContentReferenceElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (DefaultValue != null) yield return DefaultValue; - if (MeaningWhenMissingElement != null) yield return MeaningWhenMissingElement; - if (OrderMeaningElement != null) yield return OrderMeaningElement; - if (Fixed != null) yield return Fixed; - if (Pattern != null) yield return Pattern; - foreach (var elem in Example) { if (elem != null) yield return elem; } - if (MinValue != null) yield return MinValue; - if (MaxValue != null) yield return MaxValue; - if (MaxLengthElement != null) yield return MaxLengthElement; - foreach (var elem in ConditionElement) { if (elem != null) yield return elem; } - foreach (var elem in Constraint) { if (elem != null) yield return elem; } - if (MustHaveValueElement != null) yield return MustHaveValueElement; - foreach (var elem in ValueAlternativesElement) { if (elem != null) yield return elem; } - if (MustSupportElement != null) yield return MustSupportElement; - if (IsModifierElement != null) yield return IsModifierElement; - if (IsModifierReasonElement != null) yield return IsModifierReasonElement; - if (IsSummaryElement != null) yield return IsSummaryElement; - if (Binding != null) yield return Binding; - foreach (var elem in Mapping) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - foreach (var elem in RepresentationElement) { if (elem != null) yield return new ElementValue("representation", elem); } - if (SliceNameElement != null) yield return new ElementValue("sliceName", SliceNameElement); - if (SliceIsConstrainingElement != null) yield return new ElementValue("sliceIsConstraining", SliceIsConstrainingElement); - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (Slicing != null) yield return new ElementValue("slicing", Slicing); - if (ShortElement != null) yield return new ElementValue("short", ShortElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (RequirementsElement != null) yield return new ElementValue("requirements", RequirementsElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (Base != null) yield return new ElementValue("base", Base); - if (ContentReferenceElement != null) yield return new ElementValue("contentReference", ContentReferenceElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (DefaultValue != null) yield return new ElementValue("defaultValue", DefaultValue); - if (MeaningWhenMissingElement != null) yield return new ElementValue("meaningWhenMissing", MeaningWhenMissingElement); - if (OrderMeaningElement != null) yield return new ElementValue("orderMeaning", OrderMeaningElement); - if (Fixed != null) yield return new ElementValue("fixed", Fixed); - if (Pattern != null) yield return new ElementValue("pattern", Pattern); - foreach (var elem in Example) { if (elem != null) yield return new ElementValue("example", elem); } - if (MinValue != null) yield return new ElementValue("minValue", MinValue); - if (MaxValue != null) yield return new ElementValue("maxValue", MaxValue); - if (MaxLengthElement != null) yield return new ElementValue("maxLength", MaxLengthElement); - foreach (var elem in ConditionElement) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Constraint) { if (elem != null) yield return new ElementValue("constraint", elem); } - if (MustHaveValueElement != null) yield return new ElementValue("mustHaveValue", MustHaveValueElement); - foreach (var elem in ValueAlternativesElement) { if (elem != null) yield return new ElementValue("valueAlternatives", elem); } - if (MustSupportElement != null) yield return new ElementValue("mustSupport", MustSupportElement); - if (IsModifierElement != null) yield return new ElementValue("isModifier", IsModifierElement); - if (IsModifierReasonElement != null) yield return new ElementValue("isModifierReason", IsModifierReasonElement); - if (IsSummaryElement != null) yield return new ElementValue("isSummary", IsSummaryElement); - if (Binding != null) yield return new ElementValue("binding", Binding); - foreach (var elem in Mapping) { if (elem != null) yield return new ElementValue("mapping", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4070,7 +3742,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4188,7 +3860,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/RelatedArtifact.cs b/src/Hl7.Fhir.Conformance/Model/Generated/RelatedArtifact.cs index 287a243a0a..b1b99b82c2 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/RelatedArtifact.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/RelatedArtifact.cs @@ -655,47 +655,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - if (LabelElement != null) yield return LabelElement; - if (DisplayElement != null) yield return DisplayElement; - if (CitationElement != null) yield return CitationElement; - if (UrlElement != null) yield return UrlElement; - if (Document != null) yield return Document; - if (ResourceElement != null) yield return ResourceElement; - if (ResourceReference != null) yield return ResourceReference; - if (PublicationStatusElement != null) yield return PublicationStatusElement; - if (PublicationDateElement != null) yield return PublicationDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (CitationElement != null) yield return new ElementValue("citation", CitationElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Document != null) yield return new ElementValue("document", Document); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (ResourceReference != null) yield return new ElementValue("resourceReference", ResourceReference); - if (PublicationStatusElement != null) yield return new ElementValue("publicationStatus", PublicationStatusElement); - if (PublicationDateElement != null) yield return new ElementValue("publicationDate", PublicationDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -738,7 +698,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -781,7 +741,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs b/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs index 2f82e963ee..1678832756 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/StructureDefinition.cs @@ -335,33 +335,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentityElement != null) yield return IdentityElement; - if (UriElement != null) yield return UriElement; - if (NameElement != null) yield return NameElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentityElement != null) yield return new ElementValue("identity", IdentityElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -383,7 +357,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -405,7 +379,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentityElement is not null) yield return new KeyValuePair("identity",IdentityElement); @@ -543,29 +517,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -581,7 +533,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -597,7 +549,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -678,27 +630,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Element) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Element) { if (elem != null) yield return new ElementValue("element", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -711,7 +643,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -724,7 +656,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Element?.Any() == true) yield return new KeyValuePair("element",Element); @@ -804,27 +736,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Element) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Element) { if (elem != null) yield return new ElementValue("element", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -837,7 +749,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -850,7 +762,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Element?.Any() == true) yield return new KeyValuePair("element",Element); @@ -1732,83 +1644,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - foreach (var elem in Keyword) { if (elem != null) yield return elem; } - if (FhirVersionElement != null) yield return FhirVersionElement; - foreach (var elem in Mapping) { if (elem != null) yield return elem; } - if (KindElement != null) yield return KindElement; - if (AbstractElement != null) yield return AbstractElement; - foreach (var elem in Context) { if (elem != null) yield return elem; } - foreach (var elem in ContextInvariantElement) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (BaseDefinitionElement != null) yield return BaseDefinitionElement; - if (DerivationElement != null) yield return DerivationElement; - if (Snapshot != null) yield return Snapshot; - if (Differential != null) yield return Differential; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - foreach (var elem in Keyword) { if (elem != null) yield return new ElementValue("keyword", elem); } - if (FhirVersionElement != null) yield return new ElementValue("fhirVersion", FhirVersionElement); - foreach (var elem in Mapping) { if (elem != null) yield return new ElementValue("mapping", elem); } - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (AbstractElement != null) yield return new ElementValue("abstract", AbstractElement); - foreach (var elem in Context) { if (elem != null) yield return new ElementValue("context", elem); } - foreach (var elem in ContextInvariantElement) { if (elem != null) yield return new ElementValue("contextInvariant", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (BaseDefinitionElement != null) yield return new ElementValue("baseDefinition", BaseDefinitionElement); - if (DerivationElement != null) yield return new ElementValue("derivation", DerivationElement); - if (Snapshot != null) yield return new ElementValue("snapshot", Snapshot); - if (Differential != null) yield return new ElementValue("differential", Differential); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1905,7 +1741,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2002,7 +1838,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs b/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs index ffb38af3f8..46d8a900bc 100644 --- a/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs +++ b/src/Hl7.Fhir.Conformance/Model/Generated/ValueSet.cs @@ -251,35 +251,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LockedDateElement != null) yield return LockedDateElement; - if (InactiveElement != null) yield return InactiveElement; - foreach (var elem in Include) { if (elem != null) yield return elem; } - foreach (var elem in Exclude) { if (elem != null) yield return elem; } - foreach (var elem in PropertyElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LockedDateElement != null) yield return new ElementValue("lockedDate", LockedDateElement); - if (InactiveElement != null) yield return new ElementValue("inactive", InactiveElement); - foreach (var elem in Include) { if (elem != null) yield return new ElementValue("include", elem); } - foreach (var elem in Exclude) { if (elem != null) yield return new ElementValue("exclude", elem); } - foreach (var elem in PropertyElement) { if (elem != null) yield return new ElementValue("property", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -304,7 +276,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -329,7 +301,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LockedDateElement is not null) yield return new KeyValuePair("lockedDate",LockedDateElement); @@ -567,37 +539,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemElement != null) yield return SystemElement; - if (VersionElement != null) yield return VersionElement; - foreach (var elem in Concept) { if (elem != null) yield return elem; } - foreach (var elem in Filter) { if (elem != null) yield return elem; } - foreach (var elem in ValueSetElement) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - foreach (var elem in Concept) { if (elem != null) yield return new ElementValue("concept", elem); } - foreach (var elem in Filter) { if (elem != null) yield return new ElementValue("filter", elem); } - foreach (var elem in ValueSetElement) { if (elem != null) yield return new ElementValue("valueSet", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -625,7 +567,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -653,7 +595,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemElement is not null) yield return new KeyValuePair("system",SystemElement); @@ -808,31 +750,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - foreach (var elem in Designation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - foreach (var elem in Designation) { if (elem != null) yield return new ElementValue("designation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -851,7 +769,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -870,7 +788,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1041,33 +959,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LanguageElement != null) yield return LanguageElement; - if (Use != null) yield return Use; - foreach (var elem in AdditionalUse) { if (elem != null) yield return elem; } - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (Use != null) yield return new ElementValue("use", Use); - foreach (var elem in AdditionalUse) { if (elem != null) yield return new ElementValue("additionalUse", elem); } - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1089,7 +981,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1111,7 +1003,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LanguageElement is not null) yield return new KeyValuePair("language",LanguageElement); @@ -1285,31 +1177,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PropertyElement != null) yield return PropertyElement; - if (OpElement != null) yield return OpElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PropertyElement != null) yield return new ElementValue("property", PropertyElement); - if (OpElement != null) yield return new ElementValue("op", OpElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1328,7 +1196,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1347,7 +1215,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PropertyElement is not null) yield return new KeyValuePair("property",PropertyElement); @@ -1636,41 +1504,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentifierElement != null) yield return IdentifierElement; - if (NextElement != null) yield return NextElement; - if (TimestampElement != null) yield return TimestampElement; - if (TotalElement != null) yield return TotalElement; - if (OffsetElement != null) yield return OffsetElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in Contains) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentifierElement != null) yield return new ElementValue("identifier", IdentifierElement); - if (NextElement != null) yield return new ElementValue("next", NextElement); - if (TimestampElement != null) yield return new ElementValue("timestamp", TimestampElement); - if (TotalElement != null) yield return new ElementValue("total", TotalElement); - if (OffsetElement != null) yield return new ElementValue("offset", OffsetElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in Contains) { if (elem != null) yield return new ElementValue("contains", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1704,7 +1538,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1738,7 +1572,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentifierElement is not null) yield return new KeyValuePair("identifier",IdentifierElement); @@ -1862,29 +1696,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1900,7 +1712,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1916,7 +1728,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2049,29 +1861,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (UriElement != null) yield return UriElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2087,7 +1877,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2103,7 +1893,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -2422,43 +2212,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemElement != null) yield return SystemElement; - if (AbstractElement != null) yield return AbstractElement; - if (InactiveElement != null) yield return InactiveElement; - if (VersionElement != null) yield return VersionElement; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - foreach (var elem in Designation) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in Contains) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (AbstractElement != null) yield return new ElementValue("abstract", AbstractElement); - if (InactiveElement != null) yield return new ElementValue("inactive", InactiveElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - foreach (var elem in Designation) { if (elem != null) yield return new ElementValue("designation", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in Contains) { if (elem != null) yield return new ElementValue("contains", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2495,7 +2249,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2532,7 +2286,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemElement is not null) yield return new KeyValuePair("system",SystemElement); @@ -2674,31 +2428,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Value != null) yield return Value; - foreach (var elem in SubProperty) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in SubProperty) { if (elem != null) yield return new ElementValue("subProperty", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2717,7 +2447,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2736,7 +2466,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -2855,29 +2585,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2893,7 +2601,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2909,7 +2617,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -3073,31 +2781,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (InclusionCriteriaElement != null) yield return InclusionCriteriaElement; - if (FocusElement != null) yield return FocusElement; - if (ExclusionCriteriaElement != null) yield return ExclusionCriteriaElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (InclusionCriteriaElement != null) yield return new ElementValue("inclusionCriteria", InclusionCriteriaElement); - if (FocusElement != null) yield return new ElementValue("focus", FocusElement); - if (ExclusionCriteriaElement != null) yield return new ElementValue("exclusionCriteria", ExclusionCriteriaElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3116,7 +2800,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3135,7 +2819,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (InclusionCriteriaElement is not null) yield return new KeyValuePair("inclusionCriteria",InclusionCriteriaElement); @@ -3953,85 +3637,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (ImmutableElement != null) yield return ImmutableElement; - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (Compose != null) yield return Compose; - if (Expansion != null) yield return Expansion; - if (Scope != null) yield return Scope; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (ImmutableElement != null) yield return new ElementValue("immutable", ImmutableElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (Compose != null) yield return new ElementValue("compose", Compose); - if (Expansion != null) yield return new ElementValue("expansion", Expansion); - if (Scope != null) yield return new ElementValue("scope", Scope); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4131,7 +3737,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4231,7 +3837,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.ElementModel.Shared.Tests/ParseExtensionsTests.cs b/src/Hl7.Fhir.ElementModel.Shared.Tests/ParseExtensionsTests.cs index e8503bb24b..3443161fa8 100644 --- a/src/Hl7.Fhir.ElementModel.Shared.Tests/ParseExtensionsTests.cs +++ b/src/Hl7.Fhir.ElementModel.Shared.Tests/ParseExtensionsTests.cs @@ -147,7 +147,7 @@ public void TestParseCodeableReference() var node = i.ToTypedElement(); var p = node.ParseBindable(); - p.Should().BeEquivalentTo(new { Coding = new List { new Coding("http://nu.nl", "bla") } }); + p.IsExactly(new CodeableConcept { Coding = [new Coding("http://nu.nl", "bla")] }).Should().BeTrue(); i.Concept = null; node = i.ToTypedElement(); @@ -155,4 +155,4 @@ public void TestParseCodeableReference() p.Should().BeNull(); } } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.R4/Model/Generated/Account.cs b/src/Hl7.Fhir.R4/Model/Generated/Account.cs index 030c5e3bb2..199f0bd644 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Account.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Account.cs @@ -209,29 +209,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Coverage != null) yield return Coverage; - if (PriorityElement != null) yield return PriorityElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -247,7 +225,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -263,7 +241,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coverage is not null) yield return new KeyValuePair("coverage",Coverage); @@ -396,31 +374,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Party != null) yield return Party; - if (OnHoldElement != null) yield return OnHoldElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Party != null) yield return new ElementValue("party", Party); - if (OnHoldElement != null) yield return new ElementValue("onHold", OnHoldElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -458,7 +412,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Party is not null) yield return new KeyValuePair("party",Party); @@ -756,47 +710,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (NameElement != null) yield return NameElement; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (ServicePeriod != null) yield return ServicePeriod; - foreach (var elem in Coverage) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Guarantor) { if (elem != null) yield return elem; } - if (PartOf != null) yield return PartOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (ServicePeriod != null) yield return new ElementValue("servicePeriod", ServicePeriod); - foreach (var elem in Coverage) { if (elem != null) yield return new ElementValue("coverage", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Guarantor) { if (elem != null) yield return new ElementValue("guarantor", elem); } - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -839,7 +753,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -882,7 +796,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs index 4b30543734..ce1d881507 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ActivityDefinition.cs @@ -268,29 +268,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -306,7 +284,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -322,7 +300,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -439,29 +417,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -477,7 +433,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -493,7 +449,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -1727,117 +1683,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (KindElement != null) yield return KindElement; - if (ProfileElement != null) yield return ProfileElement; - if (Code != null) yield return Code; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Timing != null) yield return Timing; - if (Location != null) yield return Location; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Product != null) yield return Product; - if (Quantity != null) yield return Quantity; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in SpecimenRequirement) { if (elem != null) yield return elem; } - foreach (var elem in ObservationRequirement) { if (elem != null) yield return elem; } - foreach (var elem in ObservationResultRequirement) { if (elem != null) yield return elem; } - if (TransformElement != null) yield return TransformElement; - foreach (var elem in DynamicValue) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - if (Code != null) yield return new ElementValue("code", Code); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Product != null) yield return new ElementValue("product", Product); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in SpecimenRequirement) { if (elem != null) yield return new ElementValue("specimenRequirement", elem); } - foreach (var elem in ObservationRequirement) { if (elem != null) yield return new ElementValue("observationRequirement", elem); } - foreach (var elem in ObservationResultRequirement) { if (elem != null) yield return new ElementValue("observationResultRequirement", elem); } - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in DynamicValue) { if (elem != null) yield return new ElementValue("dynamicValue", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1985,7 +1831,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2133,7 +1979,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Address.cs b/src/Hl7.Fhir.R4/Model/Generated/Address.cs index 049d372ae4..7a871a7417 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Address.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Address.cs @@ -494,45 +494,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in LineElement) { if (elem != null) yield return elem; } - if (CityElement != null) yield return CityElement; - if (DistrictElement != null) yield return DistrictElement; - if (StateElement != null) yield return StateElement; - if (PostalCodeElement != null) yield return PostalCodeElement; - if (CountryElement != null) yield return CountryElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LineElement) { if (elem != null) yield return new ElementValue("line", elem); } - if (CityElement != null) yield return new ElementValue("city", CityElement); - if (DistrictElement != null) yield return new ElementValue("district", DistrictElement); - if (StateElement != null) yield return new ElementValue("state", StateElement); - if (PostalCodeElement != null) yield return new ElementValue("postalCode", PostalCodeElement); - if (CountryElement != null) yield return new ElementValue("country", CountryElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -572,7 +534,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -612,7 +574,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs index 99cd32e82d..b16ddb74e2 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/AdverseEvent.cs @@ -246,29 +246,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Instance != null) yield return Instance; - foreach (var elem in Causality) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Instance != null) yield return new ElementValue("instance", Instance); - foreach (var elem in Causality) { if (elem != null) yield return new ElementValue("causality", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -284,7 +262,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -300,7 +278,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Instance is not null) yield return new KeyValuePair("instance",Instance); @@ -447,33 +425,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Assessment != null) yield return Assessment; - if (ProductRelatednessElement != null) yield return ProductRelatednessElement; - if (Author != null) yield return Author; - if (Method != null) yield return Method; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Assessment != null) yield return new ElementValue("assessment", Assessment); - if (ProductRelatednessElement != null) yield return new ElementValue("productRelatedness", ProductRelatednessElement); - if (Author != null) yield return new ElementValue("author", Author); - if (Method != null) yield return new ElementValue("method", Method); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -495,7 +447,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -517,7 +469,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Assessment is not null) yield return new KeyValuePair("assessment",Assessment); @@ -998,65 +950,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (ActualityElement != null) yield return ActualityElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Event != null) yield return Event; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - if (DetectedElement != null) yield return DetectedElement; - if (RecordedDateElement != null) yield return RecordedDateElement; - foreach (var elem in ResultingCondition) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (Seriousness != null) yield return Seriousness; - if (Severity != null) yield return Severity; - if (Outcome != null) yield return Outcome; - if (Recorder != null) yield return Recorder; - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in SuspectEntity) { if (elem != null) yield return elem; } - foreach (var elem in SubjectMedicalHistory) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceDocument) { if (elem != null) yield return elem; } - foreach (var elem in Study) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (ActualityElement != null) yield return new ElementValue("actuality", ActualityElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Event != null) yield return new ElementValue("event", Event); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (DetectedElement != null) yield return new ElementValue("detected", DetectedElement); - if (RecordedDateElement != null) yield return new ElementValue("recordedDate", RecordedDateElement); - foreach (var elem in ResultingCondition) { if (elem != null) yield return new ElementValue("resultingCondition", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (Seriousness != null) yield return new ElementValue("seriousness", Seriousness); - if (Severity != null) yield return new ElementValue("severity", Severity); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in SuspectEntity) { if (elem != null) yield return new ElementValue("suspectEntity", elem); } - foreach (var elem in SubjectMedicalHistory) { if (elem != null) yield return new ElementValue("subjectMedicalHistory", elem); } - foreach (var elem in ReferenceDocument) { if (elem != null) yield return new ElementValue("referenceDocument", elem); } - foreach (var elem in Study) { if (elem != null) yield return new ElementValue("study", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1126,7 +1020,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1196,7 +1090,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs index 8e4a9a4760..bd6b5bd31a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/AllergyIntolerance.cs @@ -462,39 +462,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - foreach (var elem in Manifestation) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (OnsetElement != null) yield return OnsetElement; - if (SeverityElement != null) yield return SeverityElement; - if (ExposureRoute != null) yield return ExposureRoute; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - foreach (var elem in Manifestation) { if (elem != null) yield return new ElementValue("manifestation", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (OnsetElement != null) yield return new ElementValue("onset", OnsetElement); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (ExposureRoute != null) yield return new ElementValue("exposureRoute", ExposureRoute); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -525,7 +493,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -556,7 +524,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -984,57 +952,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ClinicalStatus != null) yield return ClinicalStatus; - if (VerificationStatus != null) yield return VerificationStatus; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in CategoryElement) { if (elem != null) yield return elem; } - if (CriticalityElement != null) yield return CriticalityElement; - if (Code != null) yield return Code; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (Onset != null) yield return Onset; - if (RecordedDateElement != null) yield return RecordedDateElement; - if (Recorder != null) yield return Recorder; - if (Asserter != null) yield return Asserter; - if (LastOccurrenceElement != null) yield return LastOccurrenceElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Reaction) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ClinicalStatus != null) yield return new ElementValue("clinicalStatus", ClinicalStatus); - if (VerificationStatus != null) yield return new ElementValue("verificationStatus", VerificationStatus); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in CategoryElement) { if (elem != null) yield return new ElementValue("category", elem); } - if (CriticalityElement != null) yield return new ElementValue("criticality", CriticalityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Onset != null) yield return new ElementValue("onset", Onset); - if (RecordedDateElement != null) yield return new ElementValue("recordedDate", RecordedDateElement); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - if (Asserter != null) yield return new ElementValue("asserter", Asserter); - if (LastOccurrenceElement != null) yield return new ElementValue("lastOccurrence", LastOccurrenceElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Reaction) { if (elem != null) yield return new ElementValue("reaction", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1092,7 +1010,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1150,7 +1068,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Annotation.cs b/src/Hl7.Fhir.R4/Model/Generated/Annotation.cs index 694f273475..c3882e22af 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Annotation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Annotation.cs @@ -187,31 +187,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Author != null) yield return Author; - if (TimeElement != null) yield return TimeElement; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Author != null) yield return new ElementValue("author", Author); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -230,7 +206,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -249,7 +225,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Author is not null) yield return new KeyValuePair("author",Author); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs index cdac934dd7..a0a01d693a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Appointment.cs @@ -334,35 +334,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Actor != null) yield return Actor; - if (RequiredElement != null) yield return RequiredElement; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Actor != null) yield return new ElementValue("actor", Actor); - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -387,7 +359,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -412,7 +384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -1010,69 +982,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CancelationReason != null) yield return CancelationReason; - foreach (var elem in ServiceCategory) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - if (AppointmentType != null) yield return AppointmentType; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (MinutesDurationElement != null) yield return MinutesDurationElement; - foreach (var elem in Slot) { if (elem != null) yield return elem; } - if (CreatedElement != null) yield return CreatedElement; - if (CommentElement != null) yield return CommentElement; - if (PatientInstructionElement != null) yield return PatientInstructionElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in RequestedPeriod) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CancelationReason != null) yield return new ElementValue("cancelationReason", CancelationReason); - foreach (var elem in ServiceCategory) { if (elem != null) yield return new ElementValue("serviceCategory", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - if (AppointmentType != null) yield return new ElementValue("appointmentType", AppointmentType); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (MinutesDurationElement != null) yield return new ElementValue("minutesDuration", MinutesDurationElement); - foreach (var elem in Slot) { if (elem != null) yield return new ElementValue("slot", elem); } - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (PatientInstructionElement != null) yield return new ElementValue("patientInstruction", PatientInstructionElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in RequestedPeriod) { if (elem != null) yield return new ElementValue("requestedPeriod", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1148,7 +1058,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1224,7 +1134,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs index 8fd4699c83..a01f5c7fc0 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/AppointmentResponse.cs @@ -308,41 +308,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Appointment != null) yield return Appointment; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - foreach (var elem in ParticipantType) { if (elem != null) yield return elem; } - if (Actor != null) yield return Actor; - if (ParticipantStatusElement != null) yield return ParticipantStatusElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Appointment != null) yield return new ElementValue("appointment", Appointment); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - foreach (var elem in ParticipantType) { if (elem != null) yield return new ElementValue("participantType", elem); } - if (Actor != null) yield return new ElementValue("actor", Actor); - if (ParticipantStatusElement != null) yield return new ElementValue("participantStatus", ParticipantStatusElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -376,7 +342,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -410,7 +376,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs index a2d01919bf..8b9d327859 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/AuditEvent.cs @@ -491,47 +491,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Who != null) yield return Who; - if (AltIdElement != null) yield return AltIdElement; - if (NameElement != null) yield return NameElement; - if (RequestorElement != null) yield return RequestorElement; - if (Location != null) yield return Location; - foreach (var elem in PolicyElement) { if (elem != null) yield return elem; } - if (Media != null) yield return Media; - if (Network != null) yield return Network; - foreach (var elem in PurposeOfUse) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Who != null) yield return new ElementValue("who", Who); - if (AltIdElement != null) yield return new ElementValue("altId", AltIdElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (RequestorElement != null) yield return new ElementValue("requestor", RequestorElement); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in PolicyElement) { if (elem != null) yield return new ElementValue("policy", elem); } - if (Media != null) yield return new ElementValue("media", Media); - if (Network != null) yield return new ElementValue("network", Network); - foreach (var elem in PurposeOfUse) { if (elem != null) yield return new ElementValue("purposeOfUse", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -574,7 +534,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -617,7 +577,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -760,29 +720,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AddressElement != null) yield return AddressElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AddressElement != null) yield return new ElementValue("address", AddressElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -798,7 +736,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -814,7 +752,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AddressElement is not null) yield return new KeyValuePair("address",AddressElement); @@ -950,31 +888,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SiteElement != null) yield return SiteElement; - if (Observer != null) yield return Observer; - foreach (var elem in Type) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SiteElement != null) yield return new ElementValue("site", SiteElement); - if (Observer != null) yield return new ElementValue("observer", Observer); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -993,7 +907,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1012,7 +926,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SiteElement is not null) yield return new KeyValuePair("site",SiteElement); @@ -1284,43 +1198,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (What != null) yield return What; - if (Type != null) yield return Type; - if (Role != null) yield return Role; - if (Lifecycle != null) yield return Lifecycle; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (QueryElement != null) yield return QueryElement; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (What != null) yield return new ElementValue("what", What); - if (Type != null) yield return new ElementValue("type", Type); - if (Role != null) yield return new ElementValue("role", Role); - if (Lifecycle != null) yield return new ElementValue("lifecycle", Lifecycle); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (QueryElement != null) yield return new ElementValue("query", QueryElement); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1357,7 +1235,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1394,7 +1272,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (What is not null) yield return new KeyValuePair("what",What); @@ -1519,29 +1397,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1557,7 +1413,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1573,7 +1429,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1883,47 +1739,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Subtype) { if (elem != null) yield return elem; } - if (ActionElement != null) yield return ActionElement; - if (Period != null) yield return Period; - if (RecordedElement != null) yield return RecordedElement; - if (OutcomeElement != null) yield return OutcomeElement; - if (OutcomeDescElement != null) yield return OutcomeDescElement; - foreach (var elem in PurposeOfEvent) { if (elem != null) yield return elem; } - foreach (var elem in Agent) { if (elem != null) yield return elem; } - if (Source != null) yield return Source; - foreach (var elem in Entity) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Subtype) { if (elem != null) yield return new ElementValue("subtype", elem); } - if (ActionElement != null) yield return new ElementValue("action", ActionElement); - if (Period != null) yield return new ElementValue("period", Period); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (OutcomeDescElement != null) yield return new ElementValue("outcomeDesc", OutcomeDescElement); - foreach (var elem in PurposeOfEvent) { if (elem != null) yield return new ElementValue("purposeOfEvent", elem); } - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Entity) { if (elem != null) yield return new ElementValue("entity", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1966,7 +1782,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2009,7 +1825,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Basic.cs b/src/Hl7.Fhir.R4/Model/Generated/Basic.cs index ee64f48ba4..c4107df282 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Basic.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Basic.cs @@ -208,35 +208,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (CreatedElement != null) yield return CreatedElement; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -261,7 +233,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -286,7 +258,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs index 41ec2d9cc9..f03d32fbcb 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/BiologicallyDerivedProduct.cs @@ -257,31 +257,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Collector != null) yield return Collector; - if (Source != null) yield return Source; - if (Collected != null) yield return Collected; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Collector != null) yield return new ElementValue("collector", Collector); - if (Source != null) yield return new ElementValue("source", Source); - if (Collected != null) yield return new ElementValue("collected", Collected); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -300,7 +276,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -319,7 +295,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Collector is not null) yield return new KeyValuePair("collector",Collector); @@ -471,33 +447,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Procedure != null) yield return Procedure; - if (Additive != null) yield return Additive; - if (Time != null) yield return Time; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - if (Additive != null) yield return new ElementValue("additive", Additive); - if (Time != null) yield return new ElementValue("time", Time); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -519,7 +469,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -541,7 +491,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -659,29 +609,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Time != null) yield return Time; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Time != null) yield return new ElementValue("time", Time); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -697,7 +625,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -713,7 +641,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -894,33 +822,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (TemperatureElement != null) yield return TemperatureElement; - if (ScaleElement != null) yield return ScaleElement; - if (Duration != null) yield return Duration; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TemperatureElement != null) yield return new ElementValue("temperature", TemperatureElement); - if (ScaleElement != null) yield return new ElementValue("scale", ScaleElement); - if (Duration != null) yield return new ElementValue("duration", Duration); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -942,7 +844,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -964,7 +866,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1260,47 +1162,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ProductCategoryElement != null) yield return ProductCategoryElement; - if (ProductCode != null) yield return ProductCode; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Request) { if (elem != null) yield return elem; } - if (QuantityElement != null) yield return QuantityElement; - foreach (var elem in Parent) { if (elem != null) yield return elem; } - if (Collection != null) yield return Collection; - foreach (var elem in Processing) { if (elem != null) yield return elem; } - if (Manipulation != null) yield return Manipulation; - foreach (var elem in Storage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ProductCategoryElement != null) yield return new ElementValue("productCategory", ProductCategoryElement); - if (ProductCode != null) yield return new ElementValue("productCode", ProductCode); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - if (QuantityElement != null) yield return new ElementValue("quantity", QuantityElement); - foreach (var elem in Parent) { if (elem != null) yield return new ElementValue("parent", elem); } - if (Collection != null) yield return new ElementValue("collection", Collection); - foreach (var elem in Processing) { if (elem != null) yield return new ElementValue("processing", elem); } - if (Manipulation != null) yield return new ElementValue("manipulation", Manipulation); - foreach (var elem in Storage) { if (elem != null) yield return new ElementValue("storage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1343,7 +1205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1386,7 +1248,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs index 4f5e3efc1c..e8fa8d30b8 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/BodyStructure.cs @@ -276,41 +276,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Morphology != null) yield return Morphology; - if (Location != null) yield return Location; - foreach (var elem in LocationQualifier) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Image) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Morphology != null) yield return new ElementValue("morphology", Morphology); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in LocationQualifier) { if (elem != null) yield return new ElementValue("locationQualifier", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Image) { if (elem != null) yield return new ElementValue("image", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -344,7 +310,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -378,7 +344,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs index adb4d5e6d9..d3d1be501d 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CarePlan.cs @@ -358,35 +358,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in OutcomeCodeableConcept) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeReference) { if (elem != null) yield return elem; } - foreach (var elem in Progress) { if (elem != null) yield return elem; } - if (Reference != null) yield return Reference; - if (Detail != null) yield return Detail; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in OutcomeCodeableConcept) { if (elem != null) yield return new ElementValue("outcomeCodeableConcept", elem); } - foreach (var elem in OutcomeReference) { if (elem != null) yield return new ElementValue("outcomeReference", elem); } - foreach (var elem in Progress) { if (elem != null) yield return new ElementValue("progress", elem); } - if (Reference != null) yield return new ElementValue("reference", Reference); - if (Detail != null) yield return new ElementValue("detail", Detail); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -411,7 +383,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -436,7 +408,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (OutcomeCodeableConcept?.Any() == true) yield return new KeyValuePair("outcomeCodeableConcept",OutcomeCodeableConcept); @@ -910,59 +882,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Scheduled != null) yield return Scheduled; - if (Location != null) yield return Location; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Product != null) yield return Product; - if (DailyAmount != null) yield return DailyAmount; - if (Quantity != null) yield return Quantity; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Scheduled != null) yield return new ElementValue("scheduled", Scheduled); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Product != null) yield return new ElementValue("product", Product); - if (DailyAmount != null) yield return new ElementValue("dailyAmount", DailyAmount); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1023,7 +943,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1084,7 +1004,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -1690,71 +1610,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Period != null) yield return Period; - if (CreatedElement != null) yield return CreatedElement; - if (Author != null) yield return Author; - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Activity) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Period != null) yield return new ElementValue("period", Period); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Activity) { if (elem != null) yield return new ElementValue("activity", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1833,7 +1689,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1912,7 +1768,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs index d4b7e9a029..9f3453462c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CareTeam.cs @@ -224,33 +224,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Member != null) yield return Member; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Member != null) yield return new ElementValue("member", Member); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -272,7 +246,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -294,7 +268,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role?.Any() == true) yield return new KeyValuePair("role",Role); @@ -613,51 +587,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Period != null) yield return Period; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in ManagingOrganization) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in ManagingOrganization) { if (elem != null) yield return new ElementValue("managingOrganization", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -706,7 +636,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -755,7 +685,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs b/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs index 54b82e1551..0f3dbda750 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CatalogEntry.cs @@ -192,29 +192,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RelationtypeElement != null) yield return RelationtypeElement; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RelationtypeElement != null) yield return new ElementValue("relationtype", RelationtypeElement); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -230,7 +208,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -246,7 +224,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RelationtypeElement is not null) yield return new KeyValuePair("relationtype",RelationtypeElement); @@ -588,51 +566,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (OrderableElement != null) yield return OrderableElement; - if (ReferencedItem != null) yield return ReferencedItem; - foreach (var elem in AdditionalIdentifier) { if (elem != null) yield return elem; } - foreach (var elem in Classification) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ValidityPeriod != null) yield return ValidityPeriod; - if (ValidToElement != null) yield return ValidToElement; - if (LastUpdatedElement != null) yield return LastUpdatedElement; - foreach (var elem in AdditionalCharacteristic) { if (elem != null) yield return elem; } - foreach (var elem in AdditionalClassification) { if (elem != null) yield return elem; } - foreach (var elem in RelatedEntry) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (OrderableElement != null) yield return new ElementValue("orderable", OrderableElement); - if (ReferencedItem != null) yield return new ElementValue("referencedItem", ReferencedItem); - foreach (var elem in AdditionalIdentifier) { if (elem != null) yield return new ElementValue("additionalIdentifier", elem); } - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - if (ValidToElement != null) yield return new ElementValue("validTo", ValidToElement); - if (LastUpdatedElement != null) yield return new ElementValue("lastUpdated", LastUpdatedElement); - foreach (var elem in AdditionalCharacteristic) { if (elem != null) yield return new ElementValue("additionalCharacteristic", elem); } - foreach (var elem in AdditionalClassification) { if (elem != null) yield return new ElementValue("additionalClassification", elem); } - foreach (var elem in RelatedEntry) { if (elem != null) yield return new ElementValue("relatedEntry", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -681,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -730,7 +664,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs index 3f22ad1d99..4ad151c967 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ChargeItem.cs @@ -202,29 +202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -240,7 +218,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -256,7 +234,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -878,77 +856,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in DefinitionUriElement) { if (elem != null) yield return elem; } - foreach (var elem in DefinitionCanonicalElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Occurrence != null) yield return Occurrence; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (PerformingOrganization != null) yield return PerformingOrganization; - if (RequestingOrganization != null) yield return RequestingOrganization; - if (CostCenter != null) yield return CostCenter; - if (Quantity != null) yield return Quantity; - foreach (var elem in Bodysite) { if (elem != null) yield return elem; } - if (FactorOverrideElement != null) yield return FactorOverrideElement; - if (PriceOverride != null) yield return PriceOverride; - if (OverrideReasonElement != null) yield return OverrideReasonElement; - if (Enterer != null) yield return Enterer; - if (EnteredDateElement != null) yield return EnteredDateElement; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Service) { if (elem != null) yield return elem; } - if (Product != null) yield return Product; - foreach (var elem in Account) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in DefinitionUriElement) { if (elem != null) yield return new ElementValue("definitionUri", elem); } - foreach (var elem in DefinitionCanonicalElement) { if (elem != null) yield return new ElementValue("definitionCanonical", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (PerformingOrganization != null) yield return new ElementValue("performingOrganization", PerformingOrganization); - if (RequestingOrganization != null) yield return new ElementValue("requestingOrganization", RequestingOrganization); - if (CostCenter != null) yield return new ElementValue("costCenter", CostCenter); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Bodysite) { if (elem != null) yield return new ElementValue("bodysite", elem); } - if (FactorOverrideElement != null) yield return new ElementValue("factorOverride", FactorOverrideElement); - if (PriceOverride != null) yield return new ElementValue("priceOverride", PriceOverride); - if (OverrideReasonElement != null) yield return new ElementValue("overrideReason", OverrideReasonElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (EnteredDateElement != null) yield return new ElementValue("enteredDate", EnteredDateElement); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Service) { if (elem != null) yield return new ElementValue("service", elem); } - if (Product != null) yield return new ElementValue("product", Product); - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1036,7 +944,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1124,7 +1032,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs index 7f3b7771f9..8313146c65 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ChargeItemDefinition.cs @@ -217,31 +217,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (LanguageElement != null) yield return LanguageElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -260,7 +236,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -279,7 +255,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -378,29 +354,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Applicability) { if (elem != null) yield return elem; } - foreach (var elem in PriceComponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Applicability) { if (elem != null) yield return new ElementValue("applicability", elem); } - foreach (var elem in PriceComponent) { if (elem != null) yield return new ElementValue("priceComponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -416,7 +370,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -432,7 +386,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Applicability?.Any() == true) yield return new KeyValuePair("applicability",Applicability); @@ -599,33 +553,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Code != null) yield return Code; - if (FactorElement != null) yield return FactorElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Code != null) yield return new ElementValue("code", Code); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -647,7 +575,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -669,7 +597,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1362,71 +1290,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return elem; } - foreach (var elem in PartOfElement) { if (elem != null) yield return elem; } - foreach (var elem in ReplacesElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - if (Code != null) yield return Code; - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Applicability) { if (elem != null) yield return elem; } - foreach (var elem in PropertyGroup) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return new ElementValue("derivedFromUri", elem); } - foreach (var elem in PartOfElement) { if (elem != null) yield return new ElementValue("partOf", elem); } - foreach (var elem in ReplacesElement) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Applicability) { if (elem != null) yield return new ElementValue("applicability", elem); } - foreach (var elem in PropertyGroup) { if (elem != null) yield return new ElementValue("propertyGroup", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1505,7 +1369,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1584,7 +1448,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Claim.cs b/src/Hl7.Fhir.R4/Model/Generated/Claim.cs index 032ac84108..043b549e37 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Claim.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Claim.cs @@ -167,31 +167,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Claim != null) yield return Claim; - if (Relationship != null) yield return Relationship; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Claim != null) yield return new ElementValue("claim", Claim); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -229,7 +205,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Claim is not null) yield return new KeyValuePair("claim",Claim); @@ -331,29 +307,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -385,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -571,35 +525,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Provider != null) yield return Provider; - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Role != null) yield return Role; - if (Qualification != null) yield return Qualification; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Role != null) yield return new ElementValue("role", Role); - if (Qualification != null) yield return new ElementValue("qualification", Qualification); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -624,7 +550,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -649,7 +575,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -841,37 +767,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Timing != null) yield return Timing; - if (Value != null) yield return Value; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Value != null) yield return new ElementValue("value", Value); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -899,7 +795,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -927,7 +823,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1103,35 +999,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Diagnosis != null) yield return Diagnosis; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (OnAdmission != null) yield return OnAdmission; - if (PackageCode != null) yield return PackageCode; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (OnAdmission != null) yield return new ElementValue("onAdmission", OnAdmission); - if (PackageCode != null) yield return new ElementValue("packageCode", PackageCode); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1156,7 +1024,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1181,7 +1049,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1375,35 +1243,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (Procedure != null) yield return Procedure; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1428,7 +1268,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1453,7 +1293,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1713,39 +1553,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (FocalElement != null) yield return FocalElement; - if (Identifier != null) yield return Identifier; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - if (ClaimResponse != null) yield return ClaimResponse; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1776,7 +1584,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1807,7 +1615,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1947,31 +1755,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Type != null) yield return Type; - if (Location != null) yield return Location; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Location != null) yield return new ElementValue("location", Location); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1990,7 +1774,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2009,7 +1793,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -2547,67 +2331,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return new ElementValue("careTeamSequence", elem); } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return new ElementValue("diagnosisSequence", elem); } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return new ElementValue("procedureSequence", elem); } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return new ElementValue("informationSequence", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2680,7 +2404,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2753,7 +2477,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3077,49 +2801,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3165,7 +2847,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3211,7 +2893,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3509,47 +3191,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3592,7 +3234,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3635,7 +3277,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4222,79 +3864,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (BillablePeriod != null) yield return BillablePeriod; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Priority != null) yield return Priority; - if (FundsReserve != null) yield return FundsReserve; - foreach (var elem in Related) { if (elem != null) yield return elem; } - if (Prescription != null) yield return Prescription; - if (OriginalPrescription != null) yield return OriginalPrescription; - if (Payee != null) yield return Payee; - if (Referral != null) yield return Referral; - if (Facility != null) yield return Facility; - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (Accident != null) yield return Accident; - foreach (var elem in Item) { if (elem != null) yield return elem; } - if (Total != null) yield return Total; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (BillablePeriod != null) yield return new ElementValue("billablePeriod", BillablePeriod); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - if (Prescription != null) yield return new ElementValue("prescription", Prescription); - if (OriginalPrescription != null) yield return new ElementValue("originalPrescription", OriginalPrescription); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Referral != null) yield return new ElementValue("referral", Referral); - if (Facility != null) yield return new ElementValue("facility", Facility); - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (Accident != null) yield return new ElementValue("accident", Accident); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - if (Total != null) yield return new ElementValue("total", Total); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4385,7 +3955,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4476,7 +4046,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs index b8949d427b..c8ef0232e3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ClaimResponse.cs @@ -218,33 +218,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ItemSequenceElement != null) yield return ItemSequenceElement; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ItemSequenceElement != null) yield return new ElementValue("itemSequence", ItemSequenceElement); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -266,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -288,7 +262,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement is not null) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -439,33 +413,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Reason != null) yield return Reason; - if (Amount != null) yield return Amount; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -487,7 +435,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -509,7 +457,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -679,33 +627,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DetailSequenceElement != null) yield return DetailSequenceElement; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DetailSequenceElement != null) yield return new ElementValue("detailSequence", DetailSequenceElement); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -727,7 +649,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -749,7 +671,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DetailSequenceElement is not null) yield return new KeyValuePair("detailSequence",DetailSequenceElement); @@ -902,31 +824,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SubDetailSequenceElement != null) yield return SubDetailSequenceElement; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SubDetailSequenceElement != null) yield return new ElementValue("subDetailSequence", SubDetailSequenceElement); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -945,7 +843,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -964,7 +862,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SubDetailSequenceElement is not null) yield return new KeyValuePair("subDetailSequence",SubDetailSequenceElement); @@ -1431,61 +1329,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in SubdetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in Provider) { if (elem != null) yield return elem; } - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return new ElementValue("itemSequence", elem); } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return new ElementValue("detailSequence", elem); } - foreach (var elem in SubdetailSequenceElement) { if (elem != null) yield return new ElementValue("subdetailSequence", elem); } - foreach (var elem in Provider) { if (elem != null) yield return new ElementValue("provider", elem); } - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1549,7 +1393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1613,7 +1457,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement?.Any() == true) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -1880,43 +1724,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1953,7 +1761,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1990,7 +1798,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductOrService is not null) yield return new KeyValuePair("productOrService",ProductOrService); @@ -2231,41 +2039,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2299,7 +2073,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2333,7 +2107,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductOrService is not null) yield return new KeyValuePair("productOrService",ProductOrService); @@ -2439,29 +2213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2477,7 +2229,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2493,7 +2245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -2675,37 +2427,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Adjustment != null) yield return Adjustment; - if (AdjustmentReason != null) yield return AdjustmentReason; - if (DateElement != null) yield return DateElement; - if (Amount != null) yield return Amount; - if (Identifier != null) yield return Identifier; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Adjustment != null) yield return new ElementValue("adjustment", Adjustment); - if (AdjustmentReason != null) yield return new ElementValue("adjustmentReason", AdjustmentReason); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2733,7 +2455,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2761,7 +2483,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2951,33 +2673,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2999,7 +2695,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3021,7 +2717,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -3229,35 +2925,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - if (ClaimResponse != null) yield return ClaimResponse; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3282,7 +2950,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3307,7 +2975,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3495,33 +3163,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ItemSequenceElement != null) yield return ItemSequenceElement; - if (DetailSequenceElement != null) yield return DetailSequenceElement; - if (SubDetailSequenceElement != null) yield return SubDetailSequenceElement; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ItemSequenceElement != null) yield return new ElementValue("itemSequence", ItemSequenceElement); - if (DetailSequenceElement != null) yield return new ElementValue("detailSequence", DetailSequenceElement); - if (SubDetailSequenceElement != null) yield return new ElementValue("subDetailSequence", SubDetailSequenceElement); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3543,7 +3185,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3565,7 +3207,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement is not null) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -4194,79 +3836,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (CreatedElement != null) yield return CreatedElement; - if (Insurer != null) yield return Insurer; - if (Requestor != null) yield return Requestor; - if (Request != null) yield return Request; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (PreAuthRefElement != null) yield return PreAuthRefElement; - if (PreAuthPeriod != null) yield return PreAuthPeriod; - if (PayeeType != null) yield return PayeeType; - foreach (var elem in Item) { if (elem != null) yield return elem; } - foreach (var elem in AddItem) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Total) { if (elem != null) yield return elem; } - if (Payment != null) yield return Payment; - if (FundsReserve != null) yield return FundsReserve; - if (FormCode != null) yield return FormCode; - if (Form != null) yield return Form; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Error) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Requestor != null) yield return new ElementValue("requestor", Requestor); - if (Request != null) yield return new ElementValue("request", Request); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (PreAuthRefElement != null) yield return new ElementValue("preAuthRef", PreAuthRefElement); - if (PreAuthPeriod != null) yield return new ElementValue("preAuthPeriod", PreAuthPeriod); - if (PayeeType != null) yield return new ElementValue("payeeType", PayeeType); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - foreach (var elem in AddItem) { if (elem != null) yield return new ElementValue("addItem", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Total) { if (elem != null) yield return new ElementValue("total", elem); } - if (Payment != null) yield return new ElementValue("payment", Payment); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - if (FormCode != null) yield return new ElementValue("formCode", FormCode); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return new ElementValue("communicationRequest", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4357,7 +3927,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4448,7 +4018,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs index 149567b762..6d2b989409 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ClinicalImpression.cs @@ -179,29 +179,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -217,7 +195,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -233,7 +211,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -366,31 +344,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ItemCodeableConcept != null) yield return ItemCodeableConcept; - if (ItemReference != null) yield return ItemReference; - if (BasisElement != null) yield return BasisElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ItemCodeableConcept != null) yield return new ElementValue("itemCodeableConcept", ItemCodeableConcept); - if (ItemReference != null) yield return new ElementValue("itemReference", ItemReference); - if (BasisElement != null) yield return new ElementValue("basis", BasisElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -409,7 +363,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -428,7 +382,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemCodeableConcept is not null) yield return new KeyValuePair("itemCodeableConcept",ItemCodeableConcept); @@ -924,65 +878,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (DateElement != null) yield return DateElement; - if (Assessor != null) yield return Assessor; - if (Previous != null) yield return Previous; - foreach (var elem in Problem) { if (elem != null) yield return elem; } - foreach (var elem in Investigation) { if (elem != null) yield return elem; } - foreach (var elem in ProtocolElement) { if (elem != null) yield return elem; } - if (SummaryElement != null) yield return SummaryElement; - foreach (var elem in Finding) { if (elem != null) yield return elem; } - foreach (var elem in PrognosisCodeableConcept) { if (elem != null) yield return elem; } - foreach (var elem in PrognosisReference) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Assessor != null) yield return new ElementValue("assessor", Assessor); - if (Previous != null) yield return new ElementValue("previous", Previous); - foreach (var elem in Problem) { if (elem != null) yield return new ElementValue("problem", elem); } - foreach (var elem in Investigation) { if (elem != null) yield return new ElementValue("investigation", elem); } - foreach (var elem in ProtocolElement) { if (elem != null) yield return new ElementValue("protocol", elem); } - if (SummaryElement != null) yield return new ElementValue("summary", SummaryElement); - foreach (var elem in Finding) { if (elem != null) yield return new ElementValue("finding", elem); } - foreach (var elem in PrognosisCodeableConcept) { if (elem != null) yield return new ElementValue("prognosisCodeableConcept", elem); } - foreach (var elem in PrognosisReference) { if (elem != null) yield return new ElementValue("prognosisReference", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1052,7 +948,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1122,7 +1018,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Communication.cs b/src/Hl7.Fhir.R4/Model/Generated/Communication.cs index 162987fd35..a1560b20da 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Communication.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Communication.cs @@ -134,27 +134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -167,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -180,7 +160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -750,71 +730,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - foreach (var elem in InResponseTo) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in Medium) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Topic != null) yield return Topic; - foreach (var elem in About) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - if (SentElement != null) yield return SentElement; - if (ReceivedElement != null) yield return ReceivedElement; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - if (Sender != null) yield return Sender; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Payload) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - foreach (var elem in InResponseTo) { if (elem != null) yield return new ElementValue("inResponseTo", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in Medium) { if (elem != null) yield return new ElementValue("medium", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Topic != null) yield return new ElementValue("topic", Topic); - foreach (var elem in About) { if (elem != null) yield return new ElementValue("about", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (SentElement != null) yield return new ElementValue("sent", SentElement); - if (ReceivedElement != null) yield return new ElementValue("received", ReceivedElement); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - if (Sender != null) yield return new ElementValue("sender", Sender); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Payload) { if (elem != null) yield return new ElementValue("payload", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -893,7 +809,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -972,7 +888,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs index 9f7484eedd..8faac6761b 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CommunicationRequest.cs @@ -134,27 +134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -167,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -180,7 +160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -696,69 +676,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - foreach (var elem in Medium) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in About) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - foreach (var elem in Payload) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - if (Sender != null) yield return Sender; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - foreach (var elem in Medium) { if (elem != null) yield return new ElementValue("medium", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in About) { if (elem != null) yield return new ElementValue("about", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in Payload) { if (elem != null) yield return new ElementValue("payload", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - if (Sender != null) yield return new ElementValue("sender", Sender); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -834,7 +752,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -910,7 +828,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs index a784aa575f..93af966590 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CompartmentDefinition.cs @@ -221,31 +221,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in ParamElement) { if (elem != null) yield return elem; } - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in ParamElement) { if (elem != null) yield return new ElementValue("param", elem); } - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -264,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +259,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -766,53 +742,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CodeElement != null) yield return CodeElement; - if (SearchElement != null) yield return SearchElement; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (SearchElement != null) yield return new ElementValue("search", SearchElement); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -864,7 +794,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -916,7 +846,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Composition.cs b/src/Hl7.Fhir.R4/Model/Generated/Composition.cs index e0b6677acb..5dbe3f959f 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Composition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Composition.cs @@ -302,31 +302,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (TimeElement != null) yield return TimeElement; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -345,7 +321,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -364,7 +340,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -487,29 +463,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -525,7 +479,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -541,7 +495,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -659,31 +613,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -702,7 +632,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -721,7 +651,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -996,45 +926,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Code != null) yield return Code; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Focus != null) yield return Focus; - if (Text != null) yield return Text; - if (ModeElement != null) yield return ModeElement; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in Entry) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Focus != null) yield return new ElementValue("focus", Focus); - if (Text != null) yield return new ElementValue("text", Text); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1074,7 +966,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1114,7 +1006,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1511,55 +1403,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (ConfidentialityElement != null) yield return ConfidentialityElement; - foreach (var elem in Attester) { if (elem != null) yield return elem; } - if (Custodian != null) yield return Custodian; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - foreach (var elem in Event) { if (elem != null) yield return elem; } - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ConfidentialityElement != null) yield return new ElementValue("confidentiality", ConfidentialityElement); - foreach (var elem in Attester) { if (elem != null) yield return new ElementValue("attester", elem); } - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1614,7 +1458,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1669,7 +1513,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs index 63521c4022..8c9d4a70b1 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ConceptMap.cs @@ -311,37 +311,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceElement != null) yield return SourceElement; - if (SourceVersionElement != null) yield return SourceVersionElement; - if (TargetElement != null) yield return TargetElement; - if (TargetVersionElement != null) yield return TargetVersionElement; - foreach (var elem in Element) { if (elem != null) yield return elem; } - if (Unmapped != null) yield return Unmapped; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (SourceVersionElement != null) yield return new ElementValue("sourceVersion", SourceVersionElement); - if (TargetElement != null) yield return new ElementValue("target", TargetElement); - if (TargetVersionElement != null) yield return new ElementValue("targetVersion", TargetVersionElement); - foreach (var elem in Element) { if (elem != null) yield return new ElementValue("element", elem); } - if (Unmapped != null) yield return new ElementValue("unmapped", Unmapped); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +339,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -397,7 +367,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceElement is not null) yield return new KeyValuePair("source",SourceElement); @@ -551,31 +521,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -594,7 +540,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -613,7 +559,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -852,37 +798,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (EquivalenceElement != null) yield return EquivalenceElement; - if (CommentElement != null) yield return CommentElement; - foreach (var elem in DependsOn) { if (elem != null) yield return elem; } - foreach (var elem in Product) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (EquivalenceElement != null) yield return new ElementValue("equivalence", EquivalenceElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in DependsOn) { if (elem != null) yield return new ElementValue("dependsOn", elem); } - foreach (var elem in Product) { if (elem != null) yield return new ElementValue("product", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -910,7 +826,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -938,7 +854,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1144,33 +1060,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PropertyElement != null) yield return PropertyElement; - if (SystemElement != null) yield return SystemElement; - if (ValueElement != null) yield return ValueElement; - if (DisplayElement != null) yield return DisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PropertyElement != null) yield return new ElementValue("property", PropertyElement); - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1192,7 +1082,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1214,7 +1104,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PropertyElement is not null) yield return new KeyValuePair("property",PropertyElement); @@ -1420,33 +1310,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1468,7 +1332,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1490,7 +1354,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -2040,61 +1904,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (Source != null) yield return Source; - if (Target != null) yield return Target; - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (Source != null) yield return new ElementValue("source", Source); - if (Target != null) yield return new ElementValue("target", Target); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2158,7 +1968,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2222,7 +2032,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Condition.cs b/src/Hl7.Fhir.R4/Model/Generated/Condition.cs index f4cceb9eaf..cbd2675cf7 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Condition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Condition.cs @@ -259,31 +259,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Summary != null) yield return Summary; - foreach (var elem in Assessment) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Summary != null) yield return new ElementValue("summary", Summary); - foreach (var elem in Assessment) { if (elem != null) yield return new ElementValue("assessment", elem); } - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -302,7 +278,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -321,7 +297,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Summary is not null) yield return new KeyValuePair("summary",Summary); @@ -424,29 +400,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -462,7 +416,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -478,7 +432,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -846,59 +800,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ClinicalStatus != null) yield return ClinicalStatus; - if (VerificationStatus != null) yield return VerificationStatus; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Severity != null) yield return Severity; - if (Code != null) yield return Code; - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Onset != null) yield return Onset; - if (Abatement != null) yield return Abatement; - if (RecordedDateElement != null) yield return RecordedDateElement; - if (Recorder != null) yield return Recorder; - if (Asserter != null) yield return Asserter; - foreach (var elem in Stage) { if (elem != null) yield return elem; } - foreach (var elem in Evidence) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ClinicalStatus != null) yield return new ElementValue("clinicalStatus", ClinicalStatus); - if (VerificationStatus != null) yield return new ElementValue("verificationStatus", VerificationStatus); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Severity != null) yield return new ElementValue("severity", Severity); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Onset != null) yield return new ElementValue("onset", Onset); - if (Abatement != null) yield return new ElementValue("abatement", Abatement); - if (RecordedDateElement != null) yield return new ElementValue("recordedDate", RecordedDateElement); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - if (Asserter != null) yield return new ElementValue("asserter", Asserter); - foreach (var elem in Stage) { if (elem != null) yield return new ElementValue("stage", elem); } - foreach (var elem in Evidence) { if (elem != null) yield return new ElementValue("evidence", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -959,7 +861,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1020,7 +922,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Consent.cs b/src/Hl7.Fhir.R4/Model/Generated/Consent.cs index c59c727a4c..dc991ecbd4 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Consent.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Consent.cs @@ -285,29 +285,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AuthorityElement != null) yield return AuthorityElement; - if (UriElement != null) yield return UriElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AuthorityElement != null) yield return new ElementValue("authority", AuthorityElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -323,7 +301,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -339,7 +317,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AuthorityElement is not null) yield return new KeyValuePair("authority",AuthorityElement); @@ -490,31 +468,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VerifiedElement != null) yield return VerifiedElement; - if (VerifiedWith != null) yield return VerifiedWith; - if (VerificationDateElement != null) yield return VerificationDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VerifiedElement != null) yield return new ElementValue("verified", VerifiedElement); - if (VerifiedWith != null) yield return new ElementValue("verifiedWith", VerifiedWith); - if (VerificationDateElement != null) yield return new ElementValue("verificationDate", VerificationDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -533,7 +487,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -552,7 +506,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VerifiedElement is not null) yield return new KeyValuePair("verified",VerifiedElement); @@ -826,47 +780,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Period != null) yield return Period; - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Purpose) { if (elem != null) yield return elem; } - foreach (var elem in Class) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (DataPeriod != null) yield return DataPeriod; - foreach (var elem in Data) { if (elem != null) yield return elem; } - foreach (var elem in Provision) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Purpose) { if (elem != null) yield return new ElementValue("purpose", elem); } - foreach (var elem in Class) { if (elem != null) yield return new ElementValue("class", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (DataPeriod != null) yield return new ElementValue("dataPeriod", DataPeriod); - foreach (var elem in Data) { if (elem != null) yield return new ElementValue("data", elem); } - foreach (var elem in Provision) { if (elem != null) yield return new ElementValue("provision", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -909,7 +823,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -952,7 +866,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1062,29 +976,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1100,7 +992,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1116,7 +1008,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -1236,29 +1128,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MeaningElement != null) yield return MeaningElement; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MeaningElement != null) yield return new ElementValue("meaning", MeaningElement); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1274,7 +1144,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1290,7 +1160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MeaningElement is not null) yield return new KeyValuePair("meaning",MeaningElement); @@ -1609,51 +1479,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Scope != null) yield return Scope; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (DateTimeElement != null) yield return DateTimeElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Organization) { if (elem != null) yield return elem; } - if (Source != null) yield return Source; - foreach (var elem in Policy) { if (elem != null) yield return elem; } - if (PolicyRule != null) yield return PolicyRule; - foreach (var elem in Verification) { if (elem != null) yield return elem; } - if (Provision != null) yield return Provision; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Scope != null) yield return new ElementValue("scope", Scope); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateTimeElement != null) yield return new ElementValue("dateTime", DateTimeElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Organization) { if (elem != null) yield return new ElementValue("organization", elem); } - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Policy) { if (elem != null) yield return new ElementValue("policy", elem); } - if (PolicyRule != null) yield return new ElementValue("policyRule", PolicyRule); - foreach (var elem in Verification) { if (elem != null) yield return new ElementValue("verification", elem); } - if (Provision != null) yield return new ElementValue("provision", Provision); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1702,7 +1528,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1751,7 +1577,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Contract.cs b/src/Hl7.Fhir.R4/Model/Generated/Contract.cs index 9655948aff..2139ddc124 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Contract.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Contract.cs @@ -472,37 +472,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (Publisher != null) yield return Publisher; - if (PublicationDateElement != null) yield return PublicationDateElement; - if (PublicationStatusElement != null) yield return PublicationStatusElement; - if (CopyrightElement != null) yield return CopyrightElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (Publisher != null) yield return new ElementValue("publisher", Publisher); - if (PublicationDateElement != null) yield return new ElementValue("publicationDate", PublicationDateElement); - if (PublicationStatusElement != null) yield return new ElementValue("publicationStatus", PublicationStatusElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -530,7 +500,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -558,7 +528,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -864,49 +834,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (IssuedElement != null) yield return IssuedElement; - if (Applies != null) yield return Applies; - if (Topic != null) yield return Topic; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (TextElement != null) yield return TextElement; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - if (Offer != null) yield return Offer; - foreach (var elem in Asset) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Applies != null) yield return new ElementValue("applies", Applies); - if (Topic != null) yield return new ElementValue("topic", Topic); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - if (Offer != null) yield return new ElementValue("offer", Offer); - foreach (var elem in Asset) { if (elem != null) yield return new ElementValue("asset", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -952,7 +880,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -998,7 +926,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1161,33 +1089,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in NumberElement) { if (elem != null) yield return elem; } - if (Classification != null) yield return Classification; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Control) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in NumberElement) { if (elem != null) yield return new ElementValue("number", elem); } - if (Classification != null) yield return new ElementValue("classification", Classification); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Control) { if (elem != null) yield return new ElementValue("control", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1209,7 +1111,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1231,7 +1133,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement?.Any() == true) yield return new KeyValuePair("number",NumberElement); @@ -1522,45 +1424,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Party) { if (elem != null) yield return elem; } - if (Topic != null) yield return Topic; - if (Type != null) yield return Type; - if (Decision != null) yield return Decision; - foreach (var elem in DecisionMode) { if (elem != null) yield return elem; } - foreach (var elem in Answer) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Party) { if (elem != null) yield return new ElementValue("party", elem); } - if (Topic != null) yield return new ElementValue("topic", Topic); - if (Type != null) yield return new ElementValue("type", Type); - if (Decision != null) yield return new ElementValue("decision", Decision); - foreach (var elem in DecisionMode) { if (elem != null) yield return new ElementValue("decisionMode", elem); } - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1600,7 +1464,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1640,7 +1504,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1746,29 +1610,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return new ElementValue("reference", elem); } - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1784,7 +1626,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1800,7 +1642,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference?.Any() == true) yield return new KeyValuePair("reference",Reference); @@ -1881,27 +1723,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1914,7 +1736,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1927,7 +1749,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2317,55 +2139,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Scope != null) yield return Scope; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in TypeReference) { if (elem != null) yield return elem; } - foreach (var elem in Subtype) { if (elem != null) yield return elem; } - if (Relationship != null) yield return Relationship; - foreach (var elem in Context) { if (elem != null) yield return elem; } - if (ConditionElement != null) yield return ConditionElement; - foreach (var elem in PeriodType) { if (elem != null) yield return elem; } - foreach (var elem in Period) { if (elem != null) yield return elem; } - foreach (var elem in UsePeriod) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in Answer) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in ValuedItem) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Scope != null) yield return new ElementValue("scope", Scope); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in TypeReference) { if (elem != null) yield return new ElementValue("typeReference", elem); } - foreach (var elem in Subtype) { if (elem != null) yield return new ElementValue("subtype", elem); } - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - foreach (var elem in Context) { if (elem != null) yield return new ElementValue("context", elem); } - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - foreach (var elem in PeriodType) { if (elem != null) yield return new ElementValue("periodType", elem); } - foreach (var elem in Period) { if (elem != null) yield return new ElementValue("period", elem); } - foreach (var elem in UsePeriod) { if (elem != null) yield return new ElementValue("usePeriod", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - foreach (var elem in ValuedItem) { if (elem != null) yield return new ElementValue("valuedItem", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2420,7 +2194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2475,7 +2249,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Scope is not null) yield return new KeyValuePair("scope",Scope); @@ -2619,31 +2393,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2662,7 +2412,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2681,7 +2431,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -3102,53 +2852,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Entity != null) yield return Entity; - if (Identifier != null) yield return Identifier; - if (EffectiveTimeElement != null) yield return EffectiveTimeElement; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (PointsElement != null) yield return PointsElement; - if (Net != null) yield return Net; - if (PaymentElement != null) yield return PaymentElement; - if (PaymentDateElement != null) yield return PaymentDateElement; - if (Responsible != null) yield return Responsible; - if (Recipient != null) yield return Recipient; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Entity != null) yield return new ElementValue("entity", Entity); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (EffectiveTimeElement != null) yield return new ElementValue("effectiveTime", EffectiveTimeElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (PointsElement != null) yield return new ElementValue("points", PointsElement); - if (Net != null) yield return new ElementValue("net", Net); - if (PaymentElement != null) yield return new ElementValue("payment", PaymentElement); - if (PaymentDateElement != null) yield return new ElementValue("paymentDate", PaymentDateElement); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Recipient != null) yield return new ElementValue("recipient", Recipient); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3200,7 +2904,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3252,7 +2956,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Entity is not null) yield return new KeyValuePair("entity",Entity); @@ -3842,67 +3546,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Type != null) yield return Type; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Intent != null) yield return Intent; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (Context != null) yield return Context; - foreach (var elem in ContextLinkIdElement) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - foreach (var elem in Requester) { if (elem != null) yield return elem; } - foreach (var elem in RequesterLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in PerformerType) { if (elem != null) yield return elem; } - if (PerformerRole != null) yield return PerformerRole; - if (Performer != null) yield return Performer; - foreach (var elem in PerformerLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in ReasonElement) { if (elem != null) yield return elem; } - foreach (var elem in ReasonLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Intent != null) yield return new ElementValue("intent", Intent); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in ContextLinkIdElement) { if (elem != null) yield return new ElementValue("contextLinkId", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - foreach (var elem in Requester) { if (elem != null) yield return new ElementValue("requester", elem); } - foreach (var elem in RequesterLinkIdElement) { if (elem != null) yield return new ElementValue("requesterLinkId", elem); } - foreach (var elem in PerformerType) { if (elem != null) yield return new ElementValue("performerType", elem); } - if (PerformerRole != null) yield return new ElementValue("performerRole", PerformerRole); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in PerformerLinkIdElement) { if (elem != null) yield return new ElementValue("performerLinkId", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in ReasonElement) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in ReasonLinkIdElement) { if (elem != null) yield return new ElementValue("reasonLinkId", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3975,7 +3619,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4048,7 +3692,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DoNotPerformElement is not null) yield return new KeyValuePair("doNotPerform",DoNotPerformElement); @@ -4164,29 +3808,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return new ElementValue("reference", elem); } - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4202,7 +3824,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4218,7 +3840,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference?.Any() == true) yield return new KeyValuePair("reference",Reference); @@ -4338,31 +3960,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - foreach (var elem in Signature) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - foreach (var elem in Signature) { if (elem != null) yield return new ElementValue("signature", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4381,7 +3979,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4400,7 +3998,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -4485,27 +4083,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4518,7 +4096,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4531,7 +4109,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -4614,27 +4192,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4647,7 +4205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4660,7 +4218,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -4743,27 +4301,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4776,7 +4314,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4789,7 +4327,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -5572,91 +5110,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (StatusElement != null) yield return StatusElement; - if (LegalState != null) yield return LegalState; - if (InstantiatesCanonical != null) yield return InstantiatesCanonical; - if (InstantiatesUriElement != null) yield return InstantiatesUriElement; - if (ContentDerivative != null) yield return ContentDerivative; - if (IssuedElement != null) yield return IssuedElement; - if (Applies != null) yield return Applies; - if (ExpirationType != null) yield return ExpirationType; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - foreach (var elem in Authority) { if (elem != null) yield return elem; } - foreach (var elem in Domain) { if (elem != null) yield return elem; } - foreach (var elem in Site) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (Author != null) yield return Author; - if (Scope != null) yield return Scope; - if (Topic != null) yield return Topic; - if (Type != null) yield return Type; - foreach (var elem in SubType) { if (elem != null) yield return elem; } - if (ContentDefinition != null) yield return ContentDefinition; - foreach (var elem in Term) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - foreach (var elem in Signer) { if (elem != null) yield return elem; } - foreach (var elem in Friendly) { if (elem != null) yield return elem; } - foreach (var elem in Legal) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - if (LegallyBinding != null) yield return LegallyBinding; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (LegalState != null) yield return new ElementValue("legalState", LegalState); - if (InstantiatesCanonical != null) yield return new ElementValue("instantiatesCanonical", InstantiatesCanonical); - if (InstantiatesUriElement != null) yield return new ElementValue("instantiatesUri", InstantiatesUriElement); - if (ContentDerivative != null) yield return new ElementValue("contentDerivative", ContentDerivative); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Applies != null) yield return new ElementValue("applies", Applies); - if (ExpirationType != null) yield return new ElementValue("expirationType", ExpirationType); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - foreach (var elem in Authority) { if (elem != null) yield return new ElementValue("authority", elem); } - foreach (var elem in Domain) { if (elem != null) yield return new ElementValue("domain", elem); } - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (Author != null) yield return new ElementValue("author", Author); - if (Scope != null) yield return new ElementValue("scope", Scope); - if (Topic != null) yield return new ElementValue("topic", Topic); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in SubType) { if (elem != null) yield return new ElementValue("subType", elem); } - if (ContentDefinition != null) yield return new ElementValue("contentDefinition", ContentDefinition); - foreach (var elem in Term) { if (elem != null) yield return new ElementValue("term", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - foreach (var elem in Signer) { if (elem != null) yield return new ElementValue("signer", elem); } - foreach (var elem in Friendly) { if (elem != null) yield return new ElementValue("friendly", elem); } - foreach (var elem in Legal) { if (elem != null) yield return new ElementValue("legal", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - if (LegallyBinding != null) yield return new ElementValue("legallyBinding", LegallyBinding); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5765,7 +5219,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5874,7 +5328,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Contributor.cs b/src/Hl7.Fhir.R4/Model/Generated/Contributor.cs index 2f078cc91d..c5ff519e68 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Contributor.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Contributor.cs @@ -221,31 +221,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -264,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +259,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs index 35a5028c7c..4f2106ff46 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Coverage.cs @@ -203,31 +203,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ValueElement != null) yield return ValueElement; - if (NameElement != null) yield return NameElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -246,7 +222,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -265,7 +241,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -384,31 +360,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - foreach (var elem in Exception) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Exception) { if (elem != null) yield return new ElementValue("exception", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -427,7 +379,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -446,7 +398,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -545,29 +497,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -583,7 +513,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -599,7 +529,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1053,59 +983,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (PolicyHolder != null) yield return PolicyHolder; - if (Subscriber != null) yield return Subscriber; - if (SubscriberIdElement != null) yield return SubscriberIdElement; - if (Beneficiary != null) yield return Beneficiary; - if (DependentElement != null) yield return DependentElement; - if (Relationship != null) yield return Relationship; - if (Period != null) yield return Period; - foreach (var elem in Payor) { if (elem != null) yield return elem; } - foreach (var elem in Class) { if (elem != null) yield return elem; } - if (OrderElement != null) yield return OrderElement; - if (NetworkElement != null) yield return NetworkElement; - foreach (var elem in CostToBeneficiary) { if (elem != null) yield return elem; } - if (SubrogationElement != null) yield return SubrogationElement; - foreach (var elem in Contract) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (PolicyHolder != null) yield return new ElementValue("policyHolder", PolicyHolder); - if (Subscriber != null) yield return new ElementValue("subscriber", Subscriber); - if (SubscriberIdElement != null) yield return new ElementValue("subscriberId", SubscriberIdElement); - if (Beneficiary != null) yield return new ElementValue("beneficiary", Beneficiary); - if (DependentElement != null) yield return new ElementValue("dependent", DependentElement); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Payor) { if (elem != null) yield return new ElementValue("payor", elem); } - foreach (var elem in Class) { if (elem != null) yield return new ElementValue("class", elem); } - if (OrderElement != null) yield return new ElementValue("order", OrderElement); - if (NetworkElement != null) yield return new ElementValue("network", NetworkElement); - foreach (var elem in CostToBeneficiary) { if (elem != null) yield return new ElementValue("costToBeneficiary", elem); } - if (SubrogationElement != null) yield return new ElementValue("subrogation", SubrogationElement); - foreach (var elem in Contract) { if (elem != null) yield return new ElementValue("contract", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1166,7 +1044,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1227,7 +1105,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs index 97280be900..f6f0eef1e3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityRequest.cs @@ -237,31 +237,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Information != null) yield return Information; - if (AppliesToAllElement != null) yield return AppliesToAllElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Information != null) yield return new ElementValue("information", Information); - if (AppliesToAllElement != null) yield return new ElementValue("appliesToAll", AppliesToAllElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -280,7 +256,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -299,7 +275,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -452,31 +428,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -495,7 +447,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -514,7 +466,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FocalElement is not null) yield return new KeyValuePair("focal",FocalElement); @@ -770,45 +722,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in SupportingInfoSequenceElement) { if (elem != null) yield return elem; } - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Provider != null) yield return Provider; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (Facility != null) yield return Facility; - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in SupportingInfoSequenceElement) { if (elem != null) yield return new ElementValue("supportingInfoSequence", elem); } - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (Facility != null) yield return new ElementValue("facility", Facility); - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -848,7 +762,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -888,7 +802,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SupportingInfoSequenceElement?.Any() == true) yield return new KeyValuePair("supportingInfoSequence",SupportingInfoSequenceElement); @@ -980,27 +894,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Diagnosis != null) yield return Diagnosis; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1013,7 +907,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1026,7 +920,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Diagnosis is not null) yield return new KeyValuePair("diagnosis",Diagnosis); @@ -1379,53 +1273,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Priority != null) yield return Priority; - foreach (var elem in PurposeElement) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Serviced != null) yield return Serviced; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Provider != null) yield return Provider; - if (Insurer != null) yield return Insurer; - if (Facility != null) yield return Facility; - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Priority != null) yield return new ElementValue("priority", Priority); - foreach (var elem in PurposeElement) { if (elem != null) yield return new ElementValue("purpose", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Facility != null) yield return new ElementValue("facility", Facility); - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1477,7 +1325,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1529,7 +1377,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs index c0e40913ae..81359073a0 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/CoverageEligibilityResponse.cs @@ -235,33 +235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Coverage != null) yield return Coverage; - if (InforceElement != null) yield return InforceElement; - if (BenefitPeriod != null) yield return BenefitPeriod; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (InforceElement != null) yield return new ElementValue("inforce", InforceElement); - if (BenefitPeriod != null) yield return new ElementValue("benefitPeriod", BenefitPeriod); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -283,7 +257,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -305,7 +279,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coverage is not null) yield return new KeyValuePair("coverage",Coverage); @@ -697,53 +671,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Provider != null) yield return Provider; - if (ExcludedElement != null) yield return ExcludedElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Network != null) yield return Network; - if (Unit != null) yield return Unit; - if (Term != null) yield return Term; - foreach (var elem in Benefit) { if (elem != null) yield return elem; } - if (AuthorizationRequiredElement != null) yield return AuthorizationRequiredElement; - foreach (var elem in AuthorizationSupporting) { if (elem != null) yield return elem; } - if (AuthorizationUrlElement != null) yield return AuthorizationUrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ExcludedElement != null) yield return new ElementValue("excluded", ExcludedElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Network != null) yield return new ElementValue("network", Network); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Term != null) yield return new ElementValue("term", Term); - foreach (var elem in Benefit) { if (elem != null) yield return new ElementValue("benefit", elem); } - if (AuthorizationRequiredElement != null) yield return new ElementValue("authorizationRequired", AuthorizationRequiredElement); - foreach (var elem in AuthorizationSupporting) { if (elem != null) yield return new ElementValue("authorizationSupporting", elem); } - if (AuthorizationUrlElement != null) yield return new ElementValue("authorizationUrl", AuthorizationUrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -795,7 +723,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -847,7 +775,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -977,31 +905,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Allowed != null) yield return Allowed; - if (Used != null) yield return Used; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Used != null) yield return new ElementValue("used", Used); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1020,7 +924,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1039,7 +943,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1122,27 +1026,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1155,7 +1039,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1168,7 +1052,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1592,55 +1476,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in PurposeElement) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Serviced != null) yield return Serviced; - if (CreatedElement != null) yield return CreatedElement; - if (Requestor != null) yield return Requestor; - if (Request != null) yield return Request; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (Insurer != null) yield return Insurer; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (PreAuthRefElement != null) yield return PreAuthRefElement; - if (Form != null) yield return Form; - foreach (var elem in Error) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in PurposeElement) { if (elem != null) yield return new ElementValue("purpose", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Requestor != null) yield return new ElementValue("requestor", Requestor); - if (Request != null) yield return new ElementValue("request", Request); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (PreAuthRefElement != null) yield return new ElementValue("preAuthRef", PreAuthRefElement); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1695,7 +1531,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1750,7 +1586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs index 488766bc2e..cd8be32fc7 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DataRequirement.cs @@ -255,33 +255,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SearchParamElement != null) yield return SearchParamElement; - if (ValueSetElement != null) yield return ValueSetElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SearchParamElement != null) yield return new ElementValue("searchParam", SearchParamElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -303,7 +277,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -325,7 +299,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -477,31 +451,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SearchParamElement != null) yield return SearchParamElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SearchParamElement != null) yield return new ElementValue("searchParam", SearchParamElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -520,7 +470,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -539,7 +489,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -677,29 +627,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (DirectionElement != null) yield return DirectionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (DirectionElement != null) yield return new ElementValue("direction", DirectionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -715,7 +643,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -731,7 +659,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -991,41 +919,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in ProfileElement) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in MustSupportElement) { if (elem != null) yield return elem; } - foreach (var elem in CodeFilter) { if (elem != null) yield return elem; } - foreach (var elem in DateFilter) { if (elem != null) yield return elem; } - if (LimitElement != null) yield return LimitElement; - foreach (var elem in Sort) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in ProfileElement) { if (elem != null) yield return new ElementValue("profile", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in MustSupportElement) { if (elem != null) yield return new ElementValue("mustSupport", elem); } - foreach (var elem in CodeFilter) { if (elem != null) yield return new ElementValue("codeFilter", elem); } - foreach (var elem in DateFilter) { if (elem != null) yield return new ElementValue("dateFilter", elem); } - if (LimitElement != null) yield return new ElementValue("limit", LimitElement); - foreach (var elem in Sort) { if (elem != null) yield return new ElementValue("sort", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1059,7 +953,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1093,7 +987,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs index 195bff0dc6..d2dca6c09d 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DetectedIssue.cs @@ -179,29 +179,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -217,7 +195,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -233,7 +211,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -367,31 +345,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Action != null) yield return Action; - if (DateElement != null) yield return DateElement; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Action != null) yield return new ElementValue("action", Action); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -410,7 +364,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -429,7 +383,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action is not null) yield return new KeyValuePair("action",Action); @@ -765,49 +719,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Code != null) yield return Code; - if (SeverityElement != null) yield return SeverityElement; - if (Patient != null) yield return Patient; - if (Identified != null) yield return Identified; - if (Author != null) yield return Author; - foreach (var elem in Implicated) { if (elem != null) yield return elem; } - foreach (var elem in Evidence) { if (elem != null) yield return elem; } - if (DetailElement != null) yield return DetailElement; - if (ReferenceElement != null) yield return ReferenceElement; - foreach (var elem in Mitigation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Code != null) yield return new ElementValue("code", Code); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Identified != null) yield return new ElementValue("identified", Identified); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Implicated) { if (elem != null) yield return new ElementValue("implicated", elem); } - foreach (var elem in Evidence) { if (elem != null) yield return new ElementValue("evidence", elem); } - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - foreach (var elem in Mitigation) { if (elem != null) yield return new ElementValue("mitigation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -853,7 +765,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -899,7 +811,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Device.cs b/src/Hl7.Fhir.R4/Model/Generated/Device.cs index 7d779f69e1..e240339bfa 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Device.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Device.cs @@ -401,37 +401,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DeviceIdentifierElement != null) yield return DeviceIdentifierElement; - if (IssuerElement != null) yield return IssuerElement; - if (JurisdictionElement != null) yield return JurisdictionElement; - if (CarrierAIDCElement != null) yield return CarrierAIDCElement; - if (CarrierHRFElement != null) yield return CarrierHRFElement; - if (EntryTypeElement != null) yield return EntryTypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DeviceIdentifierElement != null) yield return new ElementValue("deviceIdentifier", DeviceIdentifierElement); - if (IssuerElement != null) yield return new ElementValue("issuer", IssuerElement); - if (JurisdictionElement != null) yield return new ElementValue("jurisdiction", JurisdictionElement); - if (CarrierAIDCElement != null) yield return new ElementValue("carrierAIDC", CarrierAIDCElement); - if (CarrierHRFElement != null) yield return new ElementValue("carrierHRF", CarrierHRFElement); - if (EntryTypeElement != null) yield return new ElementValue("entryType", EntryTypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -459,7 +429,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -487,7 +457,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DeviceIdentifierElement is not null) yield return new KeyValuePair("deviceIdentifier",DeviceIdentifierElement); @@ -627,29 +597,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -665,7 +613,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -681,7 +629,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -793,29 +741,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemType != null) yield return SystemType; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemType != null) yield return new ElementValue("systemType", SystemType); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -831,7 +757,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -847,7 +773,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemType is not null) yield return new KeyValuePair("systemType",SystemType); @@ -975,31 +901,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Component != null) yield return Component; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Component != null) yield return new ElementValue("component", Component); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1018,7 +920,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1037,7 +939,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1150,31 +1052,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in ValueQuantity) { if (elem != null) yield return elem; } - foreach (var elem in ValueCode) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in ValueQuantity) { if (elem != null) yield return new ElementValue("valueQuantity", elem); } - foreach (var elem in ValueCode) { if (elem != null) yield return new ElementValue("valueCode", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1193,7 +1071,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1212,7 +1090,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1886,77 +1764,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Definition != null) yield return Definition; - foreach (var elem in UdiCarrier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusReason) { if (elem != null) yield return elem; } - if (DistinctIdentifierElement != null) yield return DistinctIdentifierElement; - if (ManufacturerElement != null) yield return ManufacturerElement; - if (ManufactureDateElement != null) yield return ManufactureDateElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (LotNumberElement != null) yield return LotNumberElement; - if (SerialNumberElement != null) yield return SerialNumberElement; - foreach (var elem in DeviceName) { if (elem != null) yield return elem; } - if (ModelNumberElement != null) yield return ModelNumberElement; - if (PartNumberElement != null) yield return PartNumberElement; - if (Type != null) yield return Type; - foreach (var elem in Specialization) { if (elem != null) yield return elem; } - foreach (var elem in Version) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Owner != null) yield return Owner; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Safety) { if (elem != null) yield return elem; } - if (Parent != null) yield return Parent; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Definition != null) yield return new ElementValue("definition", Definition); - foreach (var elem in UdiCarrier) { if (elem != null) yield return new ElementValue("udiCarrier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusReason) { if (elem != null) yield return new ElementValue("statusReason", elem); } - if (DistinctIdentifierElement != null) yield return new ElementValue("distinctIdentifier", DistinctIdentifierElement); - if (ManufacturerElement != null) yield return new ElementValue("manufacturer", ManufacturerElement); - if (ManufactureDateElement != null) yield return new ElementValue("manufactureDate", ManufactureDateElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (SerialNumberElement != null) yield return new ElementValue("serialNumber", SerialNumberElement); - foreach (var elem in DeviceName) { if (elem != null) yield return new ElementValue("deviceName", elem); } - if (ModelNumberElement != null) yield return new ElementValue("modelNumber", ModelNumberElement); - if (PartNumberElement != null) yield return new ElementValue("partNumber", PartNumberElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Specialization) { if (elem != null) yield return new ElementValue("specialization", elem); } - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Owner != null) yield return new ElementValue("owner", Owner); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Safety) { if (elem != null) yield return new ElementValue("safety", elem); } - if (Parent != null) yield return new ElementValue("parent", Parent); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2044,7 +1852,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2132,7 +1940,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs index 0c488f75b8..f05eb1d43c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceDefinition.cs @@ -220,31 +220,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DeviceIdentifierElement != null) yield return DeviceIdentifierElement; - if (IssuerElement != null) yield return IssuerElement; - if (JurisdictionElement != null) yield return JurisdictionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DeviceIdentifierElement != null) yield return new ElementValue("deviceIdentifier", DeviceIdentifierElement); - if (IssuerElement != null) yield return new ElementValue("issuer", IssuerElement); - if (JurisdictionElement != null) yield return new ElementValue("jurisdiction", JurisdictionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -263,7 +239,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -282,7 +258,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DeviceIdentifierElement is not null) yield return new KeyValuePair("deviceIdentifier",DeviceIdentifierElement); @@ -416,29 +392,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -454,7 +408,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -470,7 +424,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -600,29 +554,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemTypeElement != null) yield return SystemTypeElement; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemTypeElement != null) yield return new ElementValue("systemType", SystemTypeElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -638,7 +570,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -654,7 +586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemTypeElement is not null) yield return new KeyValuePair("systemType",SystemTypeElement); @@ -749,29 +681,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Description) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Description) { if (elem != null) yield return new ElementValue("description", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -787,7 +697,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -803,7 +713,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -915,31 +825,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in ValueQuantity) { if (elem != null) yield return elem; } - foreach (var elem in ValueCode) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in ValueQuantity) { if (elem != null) yield return new ElementValue("valueQuantity", elem); } - foreach (var elem in ValueCode) { if (elem != null) yield return new ElementValue("valueCode", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -958,7 +844,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -977,7 +863,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1124,31 +1010,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - if (AlternateElement != null) yield return AlternateElement; - if (AllergenicIndicatorElement != null) yield return AllergenicIndicatorElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - if (AlternateElement != null) yield return new ElementValue("alternate", AlternateElement); - if (AllergenicIndicatorElement != null) yield return new ElementValue("allergenicIndicator", AllergenicIndicatorElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1167,7 +1029,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1186,7 +1048,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -1683,69 +1545,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in UdiDeviceIdentifier) { if (elem != null) yield return elem; } - if (Manufacturer != null) yield return Manufacturer; - foreach (var elem in DeviceName) { if (elem != null) yield return elem; } - if (ModelNumberElement != null) yield return ModelNumberElement; - if (Type != null) yield return Type; - foreach (var elem in Specialization) { if (elem != null) yield return elem; } - foreach (var elem in VersionElement) { if (elem != null) yield return elem; } - foreach (var elem in Safety) { if (elem != null) yield return elem; } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return elem; } - if (PhysicalCharacteristics != null) yield return PhysicalCharacteristics; - foreach (var elem in LanguageCode) { if (elem != null) yield return elem; } - foreach (var elem in Capability) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (UrlElement != null) yield return UrlElement; - if (OnlineInformationElement != null) yield return OnlineInformationElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (ParentDevice != null) yield return ParentDevice; - foreach (var elem in Material) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in UdiDeviceIdentifier) { if (elem != null) yield return new ElementValue("udiDeviceIdentifier", elem); } - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - foreach (var elem in DeviceName) { if (elem != null) yield return new ElementValue("deviceName", elem); } - if (ModelNumberElement != null) yield return new ElementValue("modelNumber", ModelNumberElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Specialization) { if (elem != null) yield return new ElementValue("specialization", elem); } - foreach (var elem in VersionElement) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in Safety) { if (elem != null) yield return new ElementValue("safety", elem); } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return new ElementValue("shelfLifeStorage", elem); } - if (PhysicalCharacteristics != null) yield return new ElementValue("physicalCharacteristics", PhysicalCharacteristics); - foreach (var elem in LanguageCode) { if (elem != null) yield return new ElementValue("languageCode", elem); } - foreach (var elem in Capability) { if (elem != null) yield return new ElementValue("capability", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (OnlineInformationElement != null) yield return new ElementValue("onlineInformation", OnlineInformationElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (ParentDevice != null) yield return new ElementValue("parentDevice", ParentDevice); - foreach (var elem in Material) { if (elem != null) yield return new ElementValue("material", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1821,7 +1621,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1897,7 +1697,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs index add986262e..c0570882cd 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceMetric.cs @@ -412,31 +412,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (StateElement != null) yield return StateElement; - if (TimeElement != null) yield return TimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (StateElement != null) yield return new ElementValue("state", StateElement); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -455,7 +431,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -474,7 +450,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -758,45 +734,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Unit != null) yield return Unit; - if (Source != null) yield return Source; - if (Parent != null) yield return Parent; - if (OperationalStatusElement != null) yield return OperationalStatusElement; - if (ColorElement != null) yield return ColorElement; - if (CategoryElement != null) yield return CategoryElement; - if (MeasurementPeriod != null) yield return MeasurementPeriod; - foreach (var elem in Calibration) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Source != null) yield return new ElementValue("source", Source); - if (Parent != null) yield return new ElementValue("parent", Parent); - if (OperationalStatusElement != null) yield return new ElementValue("operationalStatus", OperationalStatusElement); - if (ColorElement != null) yield return new ElementValue("color", ColorElement); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - if (MeasurementPeriod != null) yield return new ElementValue("measurementPeriod", MeasurementPeriod); - foreach (var elem in Calibration) { if (elem != null) yield return new ElementValue("calibration", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -836,7 +774,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -876,7 +814,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs index 5a0564e469..a94abe2113 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceRequest.cs @@ -149,29 +149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -187,7 +165,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -203,7 +181,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -797,73 +775,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PriorRequest) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (PerformerType != null) yield return PerformerType; - if (Performer != null) yield return Performer; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PriorRequest) { if (elem != null) yield return new ElementValue("priorRequest", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -945,7 +857,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1027,7 +939,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs b/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs index d933546488..c873273671 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DeviceUseStatement.cs @@ -416,51 +416,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - if (RecordedOnElement != null) yield return RecordedOnElement; - if (Source != null) yield return Source; - if (Device != null) yield return Device; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - if (RecordedOnElement != null) yield return new ElementValue("recordedOn", RecordedOnElement); - if (Source != null) yield return new ElementValue("source", Source); - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -509,7 +465,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -558,7 +514,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs index 24d9b305a5..4825cd6545 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DiagnosticReport.cs @@ -238,29 +238,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CommentElement != null) yield return CommentElement; - if (Link != null) yield return Link; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (Link != null) yield return new ElementValue("link", Link); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -276,7 +254,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -292,7 +270,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CommentElement is not null) yield return new KeyValuePair("comment",CommentElement); @@ -723,61 +701,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in ResultsInterpreter) { if (elem != null) yield return elem; } - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - foreach (var elem in Result) { if (elem != null) yield return elem; } - foreach (var elem in ImagingStudy) { if (elem != null) yield return elem; } - foreach (var elem in Media) { if (elem != null) yield return elem; } - if (ConclusionElement != null) yield return ConclusionElement; - foreach (var elem in ConclusionCode) { if (elem != null) yield return elem; } - foreach (var elem in PresentedForm) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in ResultsInterpreter) { if (elem != null) yield return new ElementValue("resultsInterpreter", elem); } - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - foreach (var elem in Result) { if (elem != null) yield return new ElementValue("result", elem); } - foreach (var elem in ImagingStudy) { if (elem != null) yield return new ElementValue("imagingStudy", elem); } - foreach (var elem in Media) { if (elem != null) yield return new ElementValue("media", elem); } - if (ConclusionElement != null) yield return new ElementValue("conclusion", ConclusionElement); - foreach (var elem in ConclusionCode) { if (elem != null) yield return new ElementValue("conclusionCode", elem); } - foreach (var elem in PresentedForm) { if (elem != null) yield return new ElementValue("presentedForm", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -841,7 +765,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -905,7 +829,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs index 716dd2142f..1113a8411a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DocumentManifest.cs @@ -149,29 +149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Ref != null) yield return Ref; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Ref != null) yield return new ElementValue("ref", Ref); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -187,7 +165,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -203,7 +181,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -534,49 +512,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MasterIdentifier != null) yield return MasterIdentifier; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (CreatedElement != null) yield return CreatedElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - if (SourceElement != null) yield return SourceElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Content) { if (elem != null) yield return elem; } - foreach (var elem in Related) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MasterIdentifier != null) yield return new ElementValue("masterIdentifier", MasterIdentifier); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -622,7 +558,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -668,7 +604,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MasterIdentifier is not null) yield return new KeyValuePair("masterIdentifier",MasterIdentifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs index 5295dbe8c3..7ca7f7eeee 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/DocumentReference.cs @@ -172,29 +172,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +188,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -226,7 +204,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -324,29 +302,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Attachment != null) yield return Attachment; - if (Format != null) yield return Format; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Attachment != null) yield return new ElementValue("attachment", Attachment); - if (Format != null) yield return new ElementValue("format", Format); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -362,7 +318,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -378,7 +334,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Attachment is not null) yield return new KeyValuePair("attachment",Attachment); @@ -567,39 +523,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in Event) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (FacilityType != null) yield return FacilityType; - if (PracticeSetting != null) yield return PracticeSetting; - if (SourcePatientInfo != null) yield return SourcePatientInfo; - foreach (var elem in Related) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (FacilityType != null) yield return new ElementValue("facilityType", FacilityType); - if (PracticeSetting != null) yield return new ElementValue("practiceSetting", PracticeSetting); - if (SourcePatientInfo != null) yield return new ElementValue("sourcePatientInfo", SourcePatientInfo); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -630,7 +554,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -661,7 +585,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Encounter?.Any() == true) yield return new KeyValuePair("encounter",Encounter); @@ -1066,57 +990,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MasterIdentifier != null) yield return MasterIdentifier; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (DocStatusElement != null) yield return DocStatusElement; - if (Type != null) yield return Type; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Authenticator != null) yield return Authenticator; - if (Custodian != null) yield return Custodian; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Content) { if (elem != null) yield return elem; } - if (Context != null) yield return Context; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MasterIdentifier != null) yield return new ElementValue("masterIdentifier", MasterIdentifier); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DocStatusElement != null) yield return new ElementValue("docStatus", DocStatusElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Authenticator != null) yield return new ElementValue("authenticator", Authenticator); - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - if (Context != null) yield return new ElementValue("context", Context); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1174,7 +1048,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1232,7 +1106,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MasterIdentifier is not null) yield return new KeyValuePair("masterIdentifier",MasterIdentifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs index 1fa2a2a362..4ccb8b88a3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Dosage.cs @@ -167,31 +167,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Dose != null) yield return Dose; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Dose != null) yield return new ElementValue("dose", Dose); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -229,7 +205,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -549,51 +525,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in AdditionalInstruction) { if (elem != null) yield return elem; } - if (PatientInstructionElement != null) yield return PatientInstructionElement; - if (Timing != null) yield return Timing; - if (AsNeeded != null) yield return AsNeeded; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (Method != null) yield return Method; - foreach (var elem in DoseAndRate) { if (elem != null) yield return elem; } - if (MaxDosePerPeriod != null) yield return MaxDosePerPeriod; - if (MaxDosePerAdministration != null) yield return MaxDosePerAdministration; - if (MaxDosePerLifetime != null) yield return MaxDosePerLifetime; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in AdditionalInstruction) { if (elem != null) yield return new ElementValue("additionalInstruction", elem); } - if (PatientInstructionElement != null) yield return new ElementValue("patientInstruction", PatientInstructionElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (AsNeeded != null) yield return new ElementValue("asNeeded", AsNeeded); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (Method != null) yield return new ElementValue("method", Method); - foreach (var elem in DoseAndRate) { if (elem != null) yield return new ElementValue("doseAndRate", elem); } - if (MaxDosePerPeriod != null) yield return new ElementValue("maxDosePerPeriod", MaxDosePerPeriod); - if (MaxDosePerAdministration != null) yield return new ElementValue("maxDosePerAdministration", MaxDosePerAdministration); - if (MaxDosePerLifetime != null) yield return new ElementValue("maxDosePerLifetime", MaxDosePerLifetime); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -642,7 +574,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -691,7 +623,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs b/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs index 1ca8ff4820..c65c0a10ba 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EffectEvidenceSynthesis.cs @@ -238,31 +238,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (NumberOfStudiesElement != null) yield return NumberOfStudiesElement; - if (NumberOfParticipantsElement != null) yield return NumberOfParticipantsElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (NumberOfStudiesElement != null) yield return new ElementValue("numberOfStudies", NumberOfStudiesElement); - if (NumberOfParticipantsElement != null) yield return new ElementValue("numberOfParticipants", NumberOfParticipantsElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -281,7 +257,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -300,7 +276,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -471,33 +447,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (ExposureStateElement != null) yield return ExposureStateElement; - if (VariantState != null) yield return VariantState; - if (RiskEvidenceSynthesis != null) yield return RiskEvidenceSynthesis; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ExposureStateElement != null) yield return new ElementValue("exposureState", ExposureStateElement); - if (VariantState != null) yield return new ElementValue("variantState", VariantState); - if (RiskEvidenceSynthesis != null) yield return new ElementValue("riskEvidenceSynthesis", RiskEvidenceSynthesis); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -519,7 +469,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -541,7 +491,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -743,37 +693,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Type != null) yield return Type; - if (VariantState != null) yield return VariantState; - if (ValueElement != null) yield return ValueElement; - if (UnitOfMeasure != null) yield return UnitOfMeasure; - foreach (var elem in PrecisionEstimate) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Type != null) yield return new ElementValue("type", Type); - if (VariantState != null) yield return new ElementValue("variantState", VariantState); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (UnitOfMeasure != null) yield return new ElementValue("unitOfMeasure", UnitOfMeasure); - foreach (var elem in PrecisionEstimate) { if (elem != null) yield return new ElementValue("precisionEstimate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -801,7 +721,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -829,7 +749,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1016,33 +936,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (LevelElement != null) yield return LevelElement; - if (FromElement != null) yield return FromElement; - if (ToElement != null) yield return ToElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (LevelElement != null) yield return new ElementValue("level", LevelElement); - if (FromElement != null) yield return new ElementValue("from", FromElement); - if (ToElement != null) yield return new ElementValue("to", ToElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1064,7 +958,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1086,7 +980,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1204,31 +1098,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Rating) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in CertaintySubcomponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Rating) { if (elem != null) yield return new ElementValue("rating", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in CertaintySubcomponent) { if (elem != null) yield return new ElementValue("certaintySubcomponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1247,7 +1117,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1266,7 +1136,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Rating?.Any() == true) yield return new KeyValuePair("rating",Rating); @@ -1383,31 +1253,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Rating) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Rating) { if (elem != null) yield return new ElementValue("rating", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1426,7 +1272,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1445,7 +1291,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2255,91 +2101,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (SynthesisType != null) yield return SynthesisType; - if (StudyType != null) yield return StudyType; - if (Population != null) yield return Population; - if (Exposure != null) yield return Exposure; - if (ExposureAlternative != null) yield return ExposureAlternative; - if (Outcome != null) yield return Outcome; - if (SampleSize != null) yield return SampleSize; - foreach (var elem in ResultsByExposure) { if (elem != null) yield return elem; } - foreach (var elem in EffectEstimate) { if (elem != null) yield return elem; } - foreach (var elem in Certainty) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (SynthesisType != null) yield return new ElementValue("synthesisType", SynthesisType); - if (StudyType != null) yield return new ElementValue("studyType", StudyType); - if (Population != null) yield return new ElementValue("population", Population); - if (Exposure != null) yield return new ElementValue("exposure", Exposure); - if (ExposureAlternative != null) yield return new ElementValue("exposureAlternative", ExposureAlternative); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (SampleSize != null) yield return new ElementValue("sampleSize", SampleSize); - foreach (var elem in ResultsByExposure) { if (elem != null) yield return new ElementValue("resultsByExposure", elem); } - foreach (var elem in EffectEstimate) { if (elem != null) yield return new ElementValue("effectEstimate", elem); } - foreach (var elem in Certainty) { if (elem != null) yield return new ElementValue("certainty", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2448,7 +2210,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2557,7 +2319,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs index 07d61b0613..3f5bf3c491 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Encounter.cs @@ -269,29 +269,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -307,7 +285,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -323,7 +301,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); @@ -422,29 +400,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Class != null) yield return Class; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Class != null) yield return new ElementValue("class", Class); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -460,7 +416,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -476,7 +432,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Class is not null) yield return new KeyValuePair("class",Class); @@ -592,31 +548,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Individual != null) yield return Individual; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Individual != null) yield return new ElementValue("individual", Individual); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -635,7 +567,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -654,7 +586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -786,31 +718,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Condition != null) yield return Condition; - if (Use != null) yield return Use; - if (RankElement != null) yield return RankElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Use != null) yield return new ElementValue("use", Use); - if (RankElement != null) yield return new ElementValue("rank", RankElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -829,7 +737,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -848,7 +756,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Condition is not null) yield return new KeyValuePair("condition",Condition); @@ -1071,43 +979,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PreAdmissionIdentifier != null) yield return PreAdmissionIdentifier; - if (Origin != null) yield return Origin; - if (AdmitSource != null) yield return AdmitSource; - if (ReAdmission != null) yield return ReAdmission; - foreach (var elem in DietPreference) { if (elem != null) yield return elem; } - foreach (var elem in SpecialCourtesy) { if (elem != null) yield return elem; } - foreach (var elem in SpecialArrangement) { if (elem != null) yield return elem; } - if (Destination != null) yield return Destination; - if (DischargeDisposition != null) yield return DischargeDisposition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PreAdmissionIdentifier != null) yield return new ElementValue("preAdmissionIdentifier", PreAdmissionIdentifier); - if (Origin != null) yield return new ElementValue("origin", Origin); - if (AdmitSource != null) yield return new ElementValue("admitSource", AdmitSource); - if (ReAdmission != null) yield return new ElementValue("reAdmission", ReAdmission); - foreach (var elem in DietPreference) { if (elem != null) yield return new ElementValue("dietPreference", elem); } - foreach (var elem in SpecialCourtesy) { if (elem != null) yield return new ElementValue("specialCourtesy", elem); } - foreach (var elem in SpecialArrangement) { if (elem != null) yield return new ElementValue("specialArrangement", elem); } - if (Destination != null) yield return new ElementValue("destination", Destination); - if (DischargeDisposition != null) yield return new ElementValue("dischargeDisposition", DischargeDisposition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1144,7 +1016,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1181,7 +1053,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PreAdmissionIdentifier is not null) yield return new KeyValuePair("preAdmissionIdentifier",PreAdmissionIdentifier); @@ -1341,33 +1213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Location != null) yield return Location; - if (StatusElement != null) yield return StatusElement; - if (PhysicalType != null) yield return PhysicalType; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Location != null) yield return new ElementValue("location", Location); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (PhysicalType != null) yield return new ElementValue("physicalType", PhysicalType); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1389,7 +1235,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1411,7 +1257,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Location is not null) yield return new KeyValuePair("location",Location); @@ -1890,71 +1736,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusHistory) { if (elem != null) yield return elem; } - if (Class != null) yield return Class; - foreach (var elem in ClassHistory) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (ServiceType != null) yield return ServiceType; - if (Priority != null) yield return Priority; - if (Subject != null) yield return Subject; - foreach (var elem in EpisodeOfCare) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in Appointment) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Length != null) yield return Length; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - if (Hospitalization != null) yield return Hospitalization; - foreach (var elem in Location) { if (elem != null) yield return elem; } - if (ServiceProvider != null) yield return ServiceProvider; - if (PartOf != null) yield return PartOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusHistory) { if (elem != null) yield return new ElementValue("statusHistory", elem); } - if (Class != null) yield return new ElementValue("class", Class); - foreach (var elem in ClassHistory) { if (elem != null) yield return new ElementValue("classHistory", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (ServiceType != null) yield return new ElementValue("serviceType", ServiceType); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in EpisodeOfCare) { if (elem != null) yield return new ElementValue("episodeOfCare", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in Appointment) { if (elem != null) yield return new ElementValue("appointment", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Length != null) yield return new ElementValue("length", Length); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - if (Hospitalization != null) yield return new ElementValue("hospitalization", Hospitalization); - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - if (ServiceProvider != null) yield return new ElementValue("serviceProvider", ServiceProvider); - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2033,7 +1815,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2112,7 +1894,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs index d005f9fcba..c73789a1de 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Endpoint.cs @@ -427,47 +427,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ConnectionType != null) yield return ConnectionType; - if (NameElement != null) yield return NameElement; - if (ManagingOrganization != null) yield return ManagingOrganization; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in PayloadType) { if (elem != null) yield return elem; } - foreach (var elem in PayloadMimeTypeElement) { if (elem != null) yield return elem; } - if (AddressElement != null) yield return AddressElement; - foreach (var elem in HeaderElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ConnectionType != null) yield return new ElementValue("connectionType", ConnectionType); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in PayloadType) { if (elem != null) yield return new ElementValue("payloadType", elem); } - foreach (var elem in PayloadMimeTypeElement) { if (elem != null) yield return new ElementValue("payloadMimeType", elem); } - if (AddressElement != null) yield return new ElementValue("address", AddressElement); - foreach (var elem in HeaderElement) { if (elem != null) yield return new ElementValue("header", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -510,7 +470,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -553,7 +513,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs index 8f0ed7c2c7..894aa6282a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentRequest.cs @@ -259,39 +259,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CreatedElement != null) yield return CreatedElement; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Candidate != null) yield return Candidate; - if (Coverage != null) yield return Coverage; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Candidate != null) yield return new ElementValue("candidate", Candidate); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -322,7 +290,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -353,7 +321,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs index 6f3b5e969d..5a8dd085f6 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EnrollmentResponse.cs @@ -311,41 +311,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Request != null) yield return Request; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (CreatedElement != null) yield return CreatedElement; - if (Organization != null) yield return Organization; - if (RequestProvider != null) yield return RequestProvider; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Request != null) yield return new ElementValue("request", Request); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (RequestProvider != null) yield return new ElementValue("requestProvider", RequestProvider); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -379,7 +345,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -413,7 +379,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs index fb6146368e..f246a0a2d3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EpisodeOfCare.cs @@ -220,29 +220,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -258,7 +236,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -274,7 +252,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); @@ -405,31 +383,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Condition != null) yield return Condition; - if (Role != null) yield return Role; - if (RankElement != null) yield return RankElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Role != null) yield return new ElementValue("role", Role); - if (RankElement != null) yield return new ElementValue("rank", RankElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -448,7 +402,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -467,7 +421,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Condition is not null) yield return new KeyValuePair("condition",Condition); @@ -755,49 +709,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusHistory) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (Period != null) yield return Period; - foreach (var elem in ReferralRequest) { if (elem != null) yield return elem; } - if (CareManager != null) yield return CareManager; - foreach (var elem in Team) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusHistory) { if (elem != null) yield return new ElementValue("statusHistory", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in ReferralRequest) { if (elem != null) yield return new ElementValue("referralRequest", elem); } - if (CareManager != null) yield return new ElementValue("careManager", CareManager); - foreach (var elem in Team) { if (elem != null) yield return new ElementValue("team", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -843,7 +755,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -889,7 +801,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs index 8186e3e05a..f8204cab02 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EventDefinition.cs @@ -838,81 +838,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Trigger) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Trigger) { if (elem != null) yield return new ElementValue("trigger", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1006,7 +932,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1100,7 +1026,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs index 0c95952a13..1a6b72b815 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Evidence.cs @@ -807,81 +807,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (ShortTitleElement != null) yield return ShortTitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (ExposureBackground != null) yield return ExposureBackground; - foreach (var elem in ExposureVariant) { if (elem != null) yield return elem; } - foreach (var elem in Outcome) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ShortTitleElement != null) yield return new ElementValue("shortTitle", ShortTitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (ExposureBackground != null) yield return new ElementValue("exposureBackground", ExposureBackground); - foreach (var elem in ExposureVariant) { if (elem != null) yield return new ElementValue("exposureVariant", elem); } - foreach (var elem in Outcome) { if (elem != null) yield return new ElementValue("outcome", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -975,7 +901,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1069,7 +995,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs index 40e9c9800a..e39b24ab81 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/EvidenceVariable.cs @@ -291,39 +291,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Definition != null) yield return Definition; - foreach (var elem in UsageContext) { if (elem != null) yield return elem; } - if (ExcludeElement != null) yield return ExcludeElement; - if (ParticipantEffective != null) yield return ParticipantEffective; - if (TimeFromStart != null) yield return TimeFromStart; - if (GroupMeasureElement != null) yield return GroupMeasureElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Definition != null) yield return new ElementValue("definition", Definition); - foreach (var elem in UsageContext) { if (elem != null) yield return new ElementValue("usageContext", elem); } - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (ParticipantEffective != null) yield return new ElementValue("participantEffective", ParticipantEffective); - if (TimeFromStart != null) yield return new ElementValue("timeFromStart", TimeFromStart); - if (GroupMeasureElement != null) yield return new ElementValue("groupMeasure", GroupMeasureElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -354,7 +322,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -385,7 +353,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1143,79 +1111,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (ShortTitleElement != null) yield return ShortTitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ShortTitleElement != null) yield return new ElementValue("shortTitle", ShortTitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1306,7 +1202,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1397,7 +1293,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs index 5d6938b8be..c74dd42438 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ExampleScenario.cs @@ -270,33 +270,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActorIdElement != null) yield return ActorIdElement; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActorIdElement != null) yield return new ElementValue("actorId", ActorIdElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -318,7 +292,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -340,7 +314,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActorIdElement is not null) yield return new KeyValuePair("actorId",ActorIdElement); @@ -577,37 +551,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResourceIdElement != null) yield return ResourceIdElement; - if (ResourceTypeElement != null) yield return ResourceTypeElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Version) { if (elem != null) yield return elem; } - foreach (var elem in ContainedInstance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResourceIdElement != null) yield return new ElementValue("resourceId", ResourceIdElement); - if (ResourceTypeElement != null) yield return new ElementValue("resourceType", ResourceTypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in ContainedInstance) { if (elem != null) yield return new ElementValue("containedInstance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -635,7 +579,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -663,7 +607,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResourceIdElement is not null) yield return new KeyValuePair("resourceId",ResourceIdElement); @@ -798,29 +742,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VersionIdElement != null) yield return VersionIdElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VersionIdElement != null) yield return new ElementValue("versionId", VersionIdElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -836,7 +758,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -852,7 +774,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VersionIdElement is not null) yield return new KeyValuePair("versionId",VersionIdElement); @@ -985,29 +907,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResourceIdElement != null) yield return ResourceIdElement; - if (VersionIdElement != null) yield return VersionIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResourceIdElement != null) yield return new ElementValue("resourceId", ResourceIdElement); - if (VersionIdElement != null) yield return new ElementValue("versionId", VersionIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1023,7 +923,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1039,7 +939,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResourceIdElement is not null) yield return new KeyValuePair("resourceId",ResourceIdElement); @@ -1254,35 +1154,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (PreConditionsElement != null) yield return PreConditionsElement; - if (PostConditionsElement != null) yield return PostConditionsElement; - foreach (var elem in Step) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PreConditionsElement != null) yield return new ElementValue("preConditions", PreConditionsElement); - if (PostConditionsElement != null) yield return new ElementValue("postConditions", PostConditionsElement); - foreach (var elem in Step) { if (elem != null) yield return new ElementValue("step", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1307,7 +1179,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1332,7 +1204,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1480,33 +1352,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Process) { if (elem != null) yield return elem; } - if (PauseElement != null) yield return PauseElement; - if (Operation != null) yield return Operation; - foreach (var elem in Alternative) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Process) { if (elem != null) yield return new ElementValue("process", elem); } - if (PauseElement != null) yield return new ElementValue("pause", PauseElement); - if (Operation != null) yield return new ElementValue("operation", Operation); - foreach (var elem in Alternative) { if (elem != null) yield return new ElementValue("alternative", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1528,7 +1374,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1550,7 +1396,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Process?.Any() == true) yield return new KeyValuePair("process",Process); @@ -1918,45 +1764,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - if (InitiatorElement != null) yield return InitiatorElement; - if (ReceiverElement != null) yield return ReceiverElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (InitiatorActiveElement != null) yield return InitiatorActiveElement; - if (ReceiverActiveElement != null) yield return ReceiverActiveElement; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (InitiatorElement != null) yield return new ElementValue("initiator", InitiatorElement); - if (ReceiverElement != null) yield return new ElementValue("receiver", ReceiverElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (InitiatorActiveElement != null) yield return new ElementValue("initiatorActive", InitiatorActiveElement); - if (ReceiverActiveElement != null) yield return new ElementValue("receiverActive", ReceiverActiveElement); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1996,7 +1804,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2036,7 +1844,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -2194,31 +2002,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Step) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Step) { if (elem != null) yield return new ElementValue("step", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2237,7 +2021,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2256,7 +2040,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -2771,59 +2555,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (PurposeElement != null) yield return PurposeElement; - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Process) { if (elem != null) yield return elem; } - foreach (var elem in WorkflowElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Process) { if (elem != null) yield return new ElementValue("process", elem); } - foreach (var elem in WorkflowElement) { if (elem != null) yield return new ElementValue("workflow", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2884,7 +2616,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2945,7 +2677,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs index bb99511a78..fa92b75fbc 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ExplanationOfBenefit.cs @@ -200,31 +200,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Claim != null) yield return Claim; - if (Relationship != null) yield return Relationship; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Claim != null) yield return new ElementValue("claim", Claim); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -243,7 +219,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -262,7 +238,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Claim is not null) yield return new KeyValuePair("claim",Claim); @@ -363,29 +339,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -401,7 +355,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -417,7 +371,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -603,35 +557,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Provider != null) yield return Provider; - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Role != null) yield return Role; - if (Qualification != null) yield return Qualification; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Role != null) yield return new ElementValue("role", Role); - if (Qualification != null) yield return new ElementValue("qualification", Qualification); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -656,7 +582,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -681,7 +607,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -873,37 +799,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Timing != null) yield return Timing; - if (Value != null) yield return Value; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Value != null) yield return new ElementValue("value", Value); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -931,7 +827,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -959,7 +855,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1135,35 +1031,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Diagnosis != null) yield return Diagnosis; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (OnAdmission != null) yield return OnAdmission; - if (PackageCode != null) yield return PackageCode; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (OnAdmission != null) yield return new ElementValue("onAdmission", OnAdmission); - if (PackageCode != null) yield return new ElementValue("packageCode", PackageCode); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1188,7 +1056,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1213,7 +1081,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1407,35 +1275,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (Procedure != null) yield return Procedure; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1460,7 +1300,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1485,7 +1325,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1642,31 +1482,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1685,7 +1501,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1704,7 +1520,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FocalElement is not null) yield return new KeyValuePair("focal",FocalElement); @@ -1839,31 +1655,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Type != null) yield return Type; - if (Location != null) yield return Location; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Location != null) yield return new ElementValue("location", Location); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1882,7 +1674,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1901,7 +1693,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -2491,71 +2283,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return new ElementValue("careTeamSequence", elem); } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return new ElementValue("diagnosisSequence", elem); } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return new ElementValue("procedureSequence", elem); } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return new ElementValue("informationSequence", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2634,7 +2362,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2713,7 +2441,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -2883,33 +2611,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Reason != null) yield return Reason; - if (Amount != null) yield return Amount; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2931,7 +2633,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2953,7 +2655,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -3312,53 +3014,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3410,7 +3066,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3462,7 +3118,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3814,51 +3470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3907,7 +3519,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3956,7 +3568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4433,61 +4045,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in SubDetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in Provider) { if (elem != null) yield return elem; } - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return new ElementValue("itemSequence", elem); } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return new ElementValue("detailSequence", elem); } - foreach (var elem in SubDetailSequenceElement) { if (elem != null) yield return new ElementValue("subDetailSequence", elem); } - foreach (var elem in Provider) { if (elem != null) yield return new ElementValue("provider", elem); } - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4551,7 +4109,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4615,7 +4173,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement?.Any() == true) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -4882,43 +4440,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4955,7 +4477,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4992,7 +4514,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductOrService is not null) yield return new KeyValuePair("productOrService",ProductOrService); @@ -5233,41 +4755,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5301,7 +4789,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5335,7 +4823,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductOrService is not null) yield return new KeyValuePair("productOrService",ProductOrService); @@ -5441,29 +4929,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5479,7 +4945,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5495,7 +4961,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -5675,37 +5141,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Adjustment != null) yield return Adjustment; - if (AdjustmentReason != null) yield return AdjustmentReason; - if (DateElement != null) yield return DateElement; - if (Amount != null) yield return Amount; - if (Identifier != null) yield return Identifier; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Adjustment != null) yield return new ElementValue("adjustment", Adjustment); - if (AdjustmentReason != null) yield return new ElementValue("adjustmentReason", AdjustmentReason); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5733,7 +5169,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5761,7 +5197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -5950,33 +5386,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5998,7 +5408,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6020,7 +5430,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -6271,41 +5681,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (ExcludedElement != null) yield return ExcludedElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Network != null) yield return Network; - if (Unit != null) yield return Unit; - if (Term != null) yield return Term; - foreach (var elem in Financial) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (ExcludedElement != null) yield return new ElementValue("excluded", ExcludedElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Network != null) yield return new ElementValue("network", Network); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Term != null) yield return new ElementValue("term", Term); - foreach (var elem in Financial) { if (elem != null) yield return new ElementValue("financial", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6339,7 +5715,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6373,7 +5749,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -6497,31 +5873,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Allowed != null) yield return Allowed; - if (Used != null) yield return Used; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Used != null) yield return new ElementValue("used", Used); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6540,7 +5892,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6559,7 +5911,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -7482,111 +6834,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (BillablePeriod != null) yield return BillablePeriod; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Priority != null) yield return Priority; - if (FundsReserveRequested != null) yield return FundsReserveRequested; - if (FundsReserve != null) yield return FundsReserve; - foreach (var elem in Related) { if (elem != null) yield return elem; } - if (Prescription != null) yield return Prescription; - if (OriginalPrescription != null) yield return OriginalPrescription; - if (Payee != null) yield return Payee; - if (Referral != null) yield return Referral; - if (Facility != null) yield return Facility; - if (Claim != null) yield return Claim; - if (ClaimResponse != null) yield return ClaimResponse; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - foreach (var elem in PreAuthRefPeriod) { if (elem != null) yield return elem; } - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - if (PrecedenceElement != null) yield return PrecedenceElement; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (Accident != null) yield return Accident; - foreach (var elem in Item) { if (elem != null) yield return elem; } - foreach (var elem in AddItem) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Total) { if (elem != null) yield return elem; } - if (Payment != null) yield return Payment; - if (FormCode != null) yield return FormCode; - if (Form != null) yield return Form; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - if (BenefitPeriod != null) yield return BenefitPeriod; - foreach (var elem in BenefitBalance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (BillablePeriod != null) yield return new ElementValue("billablePeriod", BillablePeriod); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (FundsReserveRequested != null) yield return new ElementValue("fundsReserveRequested", FundsReserveRequested); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - if (Prescription != null) yield return new ElementValue("prescription", Prescription); - if (OriginalPrescription != null) yield return new ElementValue("originalPrescription", OriginalPrescription); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Referral != null) yield return new ElementValue("referral", Referral); - if (Facility != null) yield return new ElementValue("facility", Facility); - if (Claim != null) yield return new ElementValue("claim", Claim); - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - foreach (var elem in PreAuthRefPeriod) { if (elem != null) yield return new ElementValue("preAuthRefPeriod", elem); } - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - if (PrecedenceElement != null) yield return new ElementValue("precedence", PrecedenceElement); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (Accident != null) yield return new ElementValue("accident", Accident); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - foreach (var elem in AddItem) { if (elem != null) yield return new ElementValue("addItem", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Total) { if (elem != null) yield return new ElementValue("total", elem); } - if (Payment != null) yield return new ElementValue("payment", Payment); - if (FormCode != null) yield return new ElementValue("formCode", FormCode); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - if (BenefitPeriod != null) yield return new ElementValue("benefitPeriod", BenefitPeriod); - foreach (var elem in BenefitBalance) { if (elem != null) yield return new ElementValue("benefitBalance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -7725,7 +6973,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -7864,7 +7112,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Expression.cs b/src/Hl7.Fhir.R4/Model/Generated/Expression.cs index b8a4edb77a..226d9d0143 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Expression.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Expression.cs @@ -270,35 +270,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (NameElement != null) yield return NameElement; - if (LanguageElement != null) yield return LanguageElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (ReferenceElement != null) yield return ReferenceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -323,7 +295,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -348,7 +320,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs index 1465722277..c21bf6b8a6 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/FamilyMemberHistory.cs @@ -252,35 +252,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Outcome != null) yield return Outcome; - if (ContributedToDeathElement != null) yield return ContributedToDeathElement; - if (Onset != null) yield return Onset; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (ContributedToDeathElement != null) yield return new ElementValue("contributedToDeath", ContributedToDeathElement); - if (Onset != null) yield return new ElementValue("onset", Onset); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -305,7 +277,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -330,7 +302,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -805,61 +777,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (DataAbsentReason != null) yield return DataAbsentReason; - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (NameElement != null) yield return NameElement; - if (Relationship != null) yield return Relationship; - if (Sex != null) yield return Sex; - if (Born != null) yield return Born; - if (Age != null) yield return Age; - if (EstimatedAgeElement != null) yield return EstimatedAgeElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Sex != null) yield return new ElementValue("sex", Sex); - if (Born != null) yield return new ElementValue("born", Born); - if (Age != null) yield return new ElementValue("age", Age); - if (EstimatedAgeElement != null) yield return new ElementValue("estimatedAge", EstimatedAgeElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -923,7 +841,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -987,7 +905,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Flag.cs b/src/Hl7.Fhir.R4/Model/Generated/Flag.cs index 7d7fa6b7c3..6ee79e894d 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Flag.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Flag.cs @@ -292,41 +292,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Period != null) yield return Period; - if (Encounter != null) yield return Encounter; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Period != null) yield return new ElementValue("period", Period); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -360,7 +326,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -394,7 +360,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Goal.cs b/src/Hl7.Fhir.R4/Model/Generated/Goal.cs index dd52e810b2..c42d127c3f 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Goal.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Goal.cs @@ -234,31 +234,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Measure != null) yield return Measure; - if (Detail != null) yield return Detail; - if (Due != null) yield return Due; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Measure != null) yield return new ElementValue("measure", Measure); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (Due != null) yield return new ElementValue("due", Due); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -277,7 +253,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -296,7 +272,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Measure is not null) yield return new KeyValuePair("measure",Measure); @@ -688,57 +664,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (LifecycleStatusElement != null) yield return LifecycleStatusElement; - if (AchievementStatus != null) yield return AchievementStatus; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Priority != null) yield return Priority; - if (Description != null) yield return Description; - if (Subject != null) yield return Subject; - if (Start != null) yield return Start; - foreach (var elem in Target) { if (elem != null) yield return elem; } - if (StatusDateElement != null) yield return StatusDateElement; - if (StatusReasonElement != null) yield return StatusReasonElement; - if (ExpressedBy != null) yield return ExpressedBy; - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeCode) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeReference) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (LifecycleStatusElement != null) yield return new ElementValue("lifecycleStatus", LifecycleStatusElement); - if (AchievementStatus != null) yield return new ElementValue("achievementStatus", AchievementStatus); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Description != null) yield return new ElementValue("description", Description); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Start != null) yield return new ElementValue("start", Start); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (StatusReasonElement != null) yield return new ElementValue("statusReason", StatusReasonElement); - if (ExpressedBy != null) yield return new ElementValue("expressedBy", ExpressedBy); - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in OutcomeCode) { if (elem != null) yield return new ElementValue("outcomeCode", elem); } - foreach (var elem in OutcomeReference) { if (elem != null) yield return new ElementValue("outcomeReference", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -796,7 +722,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -854,7 +780,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs index 32b9e513e7..f37d23e799 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/GraphDefinition.cs @@ -354,37 +354,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SliceNameElement != null) yield return SliceNameElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SliceNameElement != null) yield return new ElementValue("sliceName", SliceNameElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -412,7 +382,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -440,7 +410,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -644,35 +614,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ParamsElement != null) yield return ParamsElement; - if (ProfileElement != null) yield return ProfileElement; - foreach (var elem in Compartment) { if (elem != null) yield return elem; } - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ParamsElement != null) yield return new ElementValue("params", ParamsElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - foreach (var elem in Compartment) { if (elem != null) yield return new ElementValue("compartment", elem); } - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -697,7 +639,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -722,7 +664,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -965,35 +907,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (CodeElement != null) yield return CodeElement; - if (RuleElement != null) yield return RuleElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (RuleElement != null) yield return new ElementValue("rule", RuleElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1018,7 +932,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1043,7 +957,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); @@ -1544,55 +1458,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (StartElement != null) yield return StartElement; - if (ProfileElement != null) yield return ProfileElement; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1647,7 +1513,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1702,7 +1568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Group.cs b/src/Hl7.Fhir.R4/Model/Generated/Group.cs index ce0ae6507b..fe39f62302 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Group.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Group.cs @@ -251,33 +251,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (ExcludeElement != null) yield return ExcludeElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -299,7 +273,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -321,7 +295,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -456,31 +430,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Entity != null) yield return Entity; - if (Period != null) yield return Period; - if (InactiveElement != null) yield return InactiveElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Entity != null) yield return new ElementValue("entity", Entity); - if (Period != null) yield return new ElementValue("period", Period); - if (InactiveElement != null) yield return new ElementValue("inactive", InactiveElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -499,7 +449,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -518,7 +468,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Entity is not null) yield return new KeyValuePair("entity",Entity); @@ -832,45 +782,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (TypeElement != null) yield return TypeElement; - if (ActualElement != null) yield return ActualElement; - if (Code != null) yield return Code; - if (NameElement != null) yield return NameElement; - if (QuantityElement != null) yield return QuantityElement; - if (ManagingEntity != null) yield return ManagingEntity; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Member) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - if (Code != null) yield return new ElementValue("code", Code); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (QuantityElement != null) yield return new ElementValue("quantity", QuantityElement); - if (ManagingEntity != null) yield return new ElementValue("managingEntity", ManagingEntity); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Member) { if (elem != null) yield return new ElementValue("member", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -910,7 +822,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -950,7 +862,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs index 0809e16cfa..bf6e940757 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/GuidanceResponse.cs @@ -451,55 +451,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RequestIdentifier != null) yield return RequestIdentifier; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Module != null) yield return Module; - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (OccurrenceDateTimeElement != null) yield return OccurrenceDateTimeElement; - if (Performer != null) yield return Performer; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in EvaluationMessage) { if (elem != null) yield return elem; } - if (OutputParameters != null) yield return OutputParameters; - if (Result != null) yield return Result; - foreach (var elem in DataRequirement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RequestIdentifier != null) yield return new ElementValue("requestIdentifier", RequestIdentifier); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Module != null) yield return new ElementValue("module", Module); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (OccurrenceDateTimeElement != null) yield return new ElementValue("occurrenceDateTime", OccurrenceDateTimeElement); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in EvaluationMessage) { if (elem != null) yield return new ElementValue("evaluationMessage", elem); } - if (OutputParameters != null) yield return new ElementValue("outputParameters", OutputParameters); - if (Result != null) yield return new ElementValue("result", Result); - foreach (var elem in DataRequirement) { if (elem != null) yield return new ElementValue("dataRequirement", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -554,7 +506,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -609,7 +561,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RequestIdentifier is not null) yield return new KeyValuePair("requestIdentifier",RequestIdentifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs index acf9174e67..e18a9663b2 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/HealthcareService.cs @@ -162,29 +162,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -200,7 +178,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -216,7 +194,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -420,33 +398,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return elem; } - if (AllDayElement != null) yield return AllDayElement; - if (AvailableStartTimeElement != null) yield return AvailableStartTimeElement; - if (AvailableEndTimeElement != null) yield return AvailableEndTimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return new ElementValue("daysOfWeek", elem); } - if (AllDayElement != null) yield return new ElementValue("allDay", AllDayElement); - if (AvailableStartTimeElement != null) yield return new ElementValue("availableStartTime", AvailableStartTimeElement); - if (AvailableEndTimeElement != null) yield return new ElementValue("availableEndTime", AvailableEndTimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -468,7 +420,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -490,7 +442,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DaysOfWeekElement?.Any() == true) yield return new KeyValuePair("daysOfWeek",DaysOfWeekElement); @@ -607,29 +559,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (During != null) yield return During; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (During != null) yield return new ElementValue("during", During); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -645,7 +575,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -661,7 +591,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1238,73 +1168,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (ProvidedBy != null) yield return ProvidedBy; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (CommentElement != null) yield return CommentElement; - if (ExtraDetailsElement != null) yield return ExtraDetailsElement; - if (Photo != null) yield return Photo; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in ServiceProvisionCode) { if (elem != null) yield return elem; } - foreach (var elem in Eligibility) { if (elem != null) yield return elem; } - foreach (var elem in Program) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - foreach (var elem in ReferralMethod) { if (elem != null) yield return elem; } - if (AppointmentRequiredElement != null) yield return AppointmentRequiredElement; - foreach (var elem in AvailableTime) { if (elem != null) yield return elem; } - foreach (var elem in NotAvailable) { if (elem != null) yield return elem; } - if (AvailabilityExceptionsElement != null) yield return AvailabilityExceptionsElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (ProvidedBy != null) yield return new ElementValue("providedBy", ProvidedBy); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (ExtraDetailsElement != null) yield return new ElementValue("extraDetails", ExtraDetailsElement); - if (Photo != null) yield return new ElementValue("photo", Photo); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in ServiceProvisionCode) { if (elem != null) yield return new ElementValue("serviceProvisionCode", elem); } - foreach (var elem in Eligibility) { if (elem != null) yield return new ElementValue("eligibility", elem); } - foreach (var elem in Program) { if (elem != null) yield return new ElementValue("program", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - foreach (var elem in ReferralMethod) { if (elem != null) yield return new ElementValue("referralMethod", elem); } - if (AppointmentRequiredElement != null) yield return new ElementValue("appointmentRequired", AppointmentRequiredElement); - foreach (var elem in AvailableTime) { if (elem != null) yield return new ElementValue("availableTime", elem); } - foreach (var elem in NotAvailable) { if (elem != null) yield return new ElementValue("notAvailable", elem); } - if (AvailabilityExceptionsElement != null) yield return new ElementValue("availabilityExceptions", AvailabilityExceptionsElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1386,7 +1250,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1468,7 +1332,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/HumanName.cs b/src/Hl7.Fhir.R4/Model/Generated/HumanName.cs index 62267f186d..f2bc0b19d7 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/HumanName.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/HumanName.cs @@ -376,39 +376,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (TextElement != null) yield return TextElement; - if (FamilyElement != null) yield return FamilyElement; - foreach (var elem in GivenElement) { if (elem != null) yield return elem; } - foreach (var elem in PrefixElement) { if (elem != null) yield return elem; } - foreach (var elem in SuffixElement) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (FamilyElement != null) yield return new ElementValue("family", FamilyElement); - foreach (var elem in GivenElement) { if (elem != null) yield return new ElementValue("given", elem); } - foreach (var elem in PrefixElement) { if (elem != null) yield return new ElementValue("prefix", elem); } - foreach (var elem in SuffixElement) { if (elem != null) yield return new ElementValue("suffix", elem); } - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +407,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -470,7 +438,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs index 2c8a128605..d73c05b5de 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ImagingStudy.cs @@ -449,49 +449,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (NumberElement != null) yield return NumberElement; - if (Modality != null) yield return Modality; - if (DescriptionElement != null) yield return DescriptionElement; - if (NumberOfInstancesElement != null) yield return NumberOfInstancesElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (Laterality != null) yield return Laterality; - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - if (StartedElement != null) yield return StartedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (Modality != null) yield return new ElementValue("modality", Modality); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (NumberOfInstancesElement != null) yield return new ElementValue("numberOfInstances", NumberOfInstancesElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Laterality != null) yield return new ElementValue("laterality", Laterality); - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - if (StartedElement != null) yield return new ElementValue("started", StartedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -537,7 +495,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -583,7 +541,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -694,29 +652,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -732,7 +668,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -748,7 +684,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -933,33 +869,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (SopClass != null) yield return SopClass; - if (NumberElement != null) yield return NumberElement; - if (TitleElement != null) yield return TitleElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (SopClass != null) yield return new ElementValue("sopClass", SopClass); - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -981,7 +891,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1003,7 +913,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -1500,65 +1410,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Modality) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (StartedElement != null) yield return StartedElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (Referrer != null) yield return Referrer; - foreach (var elem in Interpreter) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (NumberOfSeriesElement != null) yield return NumberOfSeriesElement; - if (NumberOfInstancesElement != null) yield return NumberOfInstancesElement; - if (ProcedureReference != null) yield return ProcedureReference; - foreach (var elem in ProcedureCode) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Series) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Modality) { if (elem != null) yield return new ElementValue("modality", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (StartedElement != null) yield return new ElementValue("started", StartedElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (Referrer != null) yield return new ElementValue("referrer", Referrer); - foreach (var elem in Interpreter) { if (elem != null) yield return new ElementValue("interpreter", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (NumberOfSeriesElement != null) yield return new ElementValue("numberOfSeries", NumberOfSeriesElement); - if (NumberOfInstancesElement != null) yield return new ElementValue("numberOfInstances", NumberOfInstancesElement); - if (ProcedureReference != null) yield return new ElementValue("procedureReference", ProcedureReference); - foreach (var elem in ProcedureCode) { if (elem != null) yield return new ElementValue("procedureCode", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Series) { if (elem != null) yield return new ElementValue("series", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1628,7 +1480,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1698,7 +1550,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs index 64a5a50bcd..2f5929e20f 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Immunization.cs @@ -178,29 +178,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -216,7 +194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -232,7 +210,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -432,33 +410,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DocumentTypeElement != null) yield return DocumentTypeElement; - if (ReferenceElement != null) yield return ReferenceElement; - if (PublicationDateElement != null) yield return PublicationDateElement; - if (PresentationDateElement != null) yield return PresentationDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DocumentTypeElement != null) yield return new ElementValue("documentType", DocumentTypeElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - if (PublicationDateElement != null) yield return new ElementValue("publicationDate", PublicationDateElement); - if (PresentationDateElement != null) yield return new ElementValue("presentationDate", PresentationDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -480,7 +432,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -502,7 +454,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DocumentTypeElement is not null) yield return new KeyValuePair("documentType",DocumentTypeElement); @@ -655,31 +607,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Detail != null) yield return Detail; - if (ReportedElement != null) yield return ReportedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (ReportedElement != null) yield return new ElementValue("reported", ReportedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -698,7 +626,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -717,7 +645,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -889,35 +817,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SeriesElement != null) yield return SeriesElement; - if (Authority != null) yield return Authority; - foreach (var elem in TargetDisease) { if (elem != null) yield return elem; } - if (DoseNumber != null) yield return DoseNumber; - if (SeriesDoses != null) yield return SeriesDoses; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - foreach (var elem in TargetDisease) { if (elem != null) yield return new ElementValue("targetDisease", elem); } - if (DoseNumber != null) yield return new ElementValue("doseNumber", DoseNumber); - if (SeriesDoses != null) yield return new ElementValue("seriesDoses", SeriesDoses); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -942,7 +842,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -967,7 +867,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SeriesElement is not null) yield return new KeyValuePair("series",SeriesElement); @@ -1616,81 +1516,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (VaccineCode != null) yield return VaccineCode; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (RecordedElement != null) yield return RecordedElement; - if (PrimarySourceElement != null) yield return PrimarySourceElement; - if (ReportOrigin != null) yield return ReportOrigin; - if (Location != null) yield return Location; - if (Manufacturer != null) yield return Manufacturer; - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (DoseQuantity != null) yield return DoseQuantity; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (IsSubpotentElement != null) yield return IsSubpotentElement; - foreach (var elem in SubpotentReason) { if (elem != null) yield return elem; } - foreach (var elem in Education) { if (elem != null) yield return elem; } - foreach (var elem in ProgramEligibility) { if (elem != null) yield return elem; } - if (FundingSource != null) yield return FundingSource; - foreach (var elem in Reaction) { if (elem != null) yield return elem; } - foreach (var elem in ProtocolApplied) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (VaccineCode != null) yield return new ElementValue("vaccineCode", VaccineCode); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (PrimarySourceElement != null) yield return new ElementValue("primarySource", PrimarySourceElement); - if (ReportOrigin != null) yield return new ElementValue("reportOrigin", ReportOrigin); - if (Location != null) yield return new ElementValue("location", Location); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (DoseQuantity != null) yield return new ElementValue("doseQuantity", DoseQuantity); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (IsSubpotentElement != null) yield return new ElementValue("isSubpotent", IsSubpotentElement); - foreach (var elem in SubpotentReason) { if (elem != null) yield return new ElementValue("subpotentReason", elem); } - foreach (var elem in Education) { if (elem != null) yield return new ElementValue("education", elem); } - foreach (var elem in ProgramEligibility) { if (elem != null) yield return new ElementValue("programEligibility", elem); } - if (FundingSource != null) yield return new ElementValue("fundingSource", FundingSource); - foreach (var elem in Reaction) { if (elem != null) yield return new ElementValue("reaction", elem); } - foreach (var elem in ProtocolApplied) { if (elem != null) yield return new ElementValue("protocolApplied", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1784,7 +1610,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1878,7 +1704,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs index 0348804f6a..6382e226a0 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationEvaluation.cs @@ -424,51 +424,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (Authority != null) yield return Authority; - if (TargetDisease != null) yield return TargetDisease; - if (ImmunizationEvent != null) yield return ImmunizationEvent; - if (DoseStatus != null) yield return DoseStatus; - foreach (var elem in DoseStatusReason) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (SeriesElement != null) yield return SeriesElement; - if (DoseNumber != null) yield return DoseNumber; - if (SeriesDoses != null) yield return SeriesDoses; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - if (TargetDisease != null) yield return new ElementValue("targetDisease", TargetDisease); - if (ImmunizationEvent != null) yield return new ElementValue("immunizationEvent", ImmunizationEvent); - if (DoseStatus != null) yield return new ElementValue("doseStatus", DoseStatus); - foreach (var elem in DoseStatusReason) { if (elem != null) yield return new ElementValue("doseStatusReason", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (DoseNumber != null) yield return new ElementValue("doseNumber", DoseNumber); - if (SeriesDoses != null) yield return new ElementValue("seriesDoses", SeriesDoses); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -517,7 +473,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -566,7 +522,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs index cdd30c27d8..e11dc3ec79 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ImmunizationRecommendation.cs @@ -359,49 +359,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in VaccineCode) { if (elem != null) yield return elem; } - if (TargetDisease != null) yield return TargetDisease; - foreach (var elem in ContraindicatedVaccineCode) { if (elem != null) yield return elem; } - if (ForecastStatus != null) yield return ForecastStatus; - foreach (var elem in ForecastReason) { if (elem != null) yield return elem; } - foreach (var elem in DateCriterion) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (SeriesElement != null) yield return SeriesElement; - if (DoseNumber != null) yield return DoseNumber; - if (SeriesDoses != null) yield return SeriesDoses; - foreach (var elem in SupportingImmunization) { if (elem != null) yield return elem; } - foreach (var elem in SupportingPatientInformation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in VaccineCode) { if (elem != null) yield return new ElementValue("vaccineCode", elem); } - if (TargetDisease != null) yield return new ElementValue("targetDisease", TargetDisease); - foreach (var elem in ContraindicatedVaccineCode) { if (elem != null) yield return new ElementValue("contraindicatedVaccineCode", elem); } - if (ForecastStatus != null) yield return new ElementValue("forecastStatus", ForecastStatus); - foreach (var elem in ForecastReason) { if (elem != null) yield return new ElementValue("forecastReason", elem); } - foreach (var elem in DateCriterion) { if (elem != null) yield return new ElementValue("dateCriterion", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (DoseNumber != null) yield return new ElementValue("doseNumber", DoseNumber); - if (SeriesDoses != null) yield return new ElementValue("seriesDoses", SeriesDoses); - foreach (var elem in SupportingImmunization) { if (elem != null) yield return new ElementValue("supportingImmunization", elem); } - foreach (var elem in SupportingPatientInformation) { if (elem != null) yield return new ElementValue("supportingPatientInformation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -447,7 +405,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -493,7 +451,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VaccineCode?.Any() == true) yield return new KeyValuePair("vaccineCode",VaccineCode); @@ -620,29 +578,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -658,7 +594,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -674,7 +610,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -830,35 +766,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (Authority != null) yield return Authority; - foreach (var elem in Recommendation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - foreach (var elem in Recommendation) { if (elem != null) yield return new ElementValue("recommendation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -883,7 +791,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -908,7 +816,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs index 076d9c3fbc..9d838f13fe 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ImplementationGuide.cs @@ -2407,31 +2407,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UriElement != null) yield return UriElement; - if (PackageIdElement != null) yield return PackageIdElement; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (PackageIdElement != null) yield return new ElementValue("packageId", PackageIdElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2450,7 +2426,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2469,7 +2445,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UriElement is not null) yield return new KeyValuePair("uri",UriElement); @@ -2607,29 +2583,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ProfileElement != null) yield return ProfileElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2645,7 +2599,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2661,7 +2615,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2810,35 +2764,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Grouping) { if (elem != null) yield return elem; } - foreach (var elem in Resource) { if (elem != null) yield return elem; } - if (Page != null) yield return Page; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in Template) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Grouping) { if (elem != null) yield return new ElementValue("grouping", elem); } - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - if (Page != null) yield return new ElementValue("page", Page); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in Template) { if (elem != null) yield return new ElementValue("template", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2863,7 +2789,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2888,7 +2814,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Grouping?.Any() == true) yield return new KeyValuePair("grouping",Grouping); @@ -3025,29 +2951,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3063,7 +2967,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3079,7 +2983,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -3319,37 +3223,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - foreach (var elem in FhirVersionElement) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Example != null) yield return Example; - if (GroupingIdElement != null) yield return GroupingIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - foreach (var elem in FhirVersionElement) { if (elem != null) yield return new ElementValue("fhirVersion", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Example != null) yield return new ElementValue("example", Example); - if (GroupingIdElement != null) yield return new ElementValue("groupingId", GroupingIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3377,7 +3251,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3405,7 +3279,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -3583,33 +3457,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Name != null) yield return Name; - if (TitleElement != null) yield return TitleElement; - if (GenerationElement != null) yield return GenerationElement; - foreach (var elem in Page) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Name != null) yield return new ElementValue("name", Name); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (GenerationElement != null) yield return new ElementValue("generation", GenerationElement); - foreach (var elem in Page) { if (elem != null) yield return new ElementValue("page", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3631,7 +3479,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3653,7 +3501,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Name is not null) yield return new KeyValuePair("name",Name); @@ -3788,29 +3636,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3826,7 +3652,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3842,7 +3668,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -4007,31 +3833,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (SourceElement != null) yield return SourceElement; - if (ScopeElement != null) yield return ScopeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (ScopeElement != null) yield return new ElementValue("scope", ScopeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4050,7 +3852,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4069,7 +3871,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -4272,35 +4074,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RenderingElement != null) yield return RenderingElement; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - foreach (var elem in Page) { if (elem != null) yield return elem; } - foreach (var elem in ImageElement) { if (elem != null) yield return elem; } - foreach (var elem in OtherElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RenderingElement != null) yield return new ElementValue("rendering", RenderingElement); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - foreach (var elem in Page) { if (elem != null) yield return new ElementValue("page", elem); } - foreach (var elem in ImageElement) { if (elem != null) yield return new ElementValue("image", elem); } - foreach (var elem in OtherElement) { if (elem != null) yield return new ElementValue("other", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4325,7 +4099,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4350,7 +4124,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RenderingElement is not null) yield return new KeyValuePair("rendering",RenderingElement); @@ -4488,31 +4262,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - if (Example != null) yield return Example; - if (RelativePathElement != null) yield return RelativePathElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - if (Example != null) yield return new ElementValue("example", Example); - if (RelativePathElement != null) yield return new ElementValue("relativePath", RelativePathElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4531,7 +4281,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4550,7 +4300,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -4719,31 +4469,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in AnchorElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in AnchorElement) { if (elem != null) yield return new ElementValue("anchor", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4762,7 +4488,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4781,7 +4507,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -5401,65 +5127,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (PackageIdElement != null) yield return PackageIdElement; - if (LicenseElement != null) yield return LicenseElement; - foreach (var elem in FhirVersionElement) { if (elem != null) yield return elem; } - foreach (var elem in DependsOn) { if (elem != null) yield return elem; } - foreach (var elem in Global) { if (elem != null) yield return elem; } - if (Definition != null) yield return Definition; - if (Manifest != null) yield return Manifest; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (PackageIdElement != null) yield return new ElementValue("packageId", PackageIdElement); - if (LicenseElement != null) yield return new ElementValue("license", LicenseElement); - foreach (var elem in FhirVersionElement) { if (elem != null) yield return new ElementValue("fhirVersion", elem); } - foreach (var elem in DependsOn) { if (elem != null) yield return new ElementValue("dependsOn", elem); } - foreach (var elem in Global) { if (elem != null) yield return new ElementValue("global", elem); } - if (Definition != null) yield return new ElementValue("definition", Definition); - if (Manifest != null) yield return new ElementValue("manifest", Manifest); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5529,7 +5197,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5599,7 +5267,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs index 41d944d24a..d9163a07a6 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/InsurancePlan.cs @@ -206,33 +206,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Purpose != null) yield return Purpose; - if (Name != null) yield return Name; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Purpose != null) yield return new ElementValue("purpose", Purpose); - if (Name != null) yield return new ElementValue("name", Name); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -254,7 +228,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -276,7 +250,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Purpose is not null) yield return new KeyValuePair("purpose",Purpose); @@ -395,31 +369,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in Benefit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in Benefit) { if (elem != null) yield return new ElementValue("benefit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -438,7 +388,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -457,7 +407,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -590,31 +540,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (RequirementElement != null) yield return RequirementElement; - foreach (var elem in Limit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (RequirementElement != null) yield return new ElementValue("requirement", RequirementElement); - foreach (var elem in Limit) { if (elem != null) yield return new ElementValue("limit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -633,7 +559,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -652,7 +578,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -749,29 +675,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -787,7 +691,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -803,7 +707,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -972,37 +876,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in GeneralCost) { if (elem != null) yield return elem; } - foreach (var elem in SpecificCost) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in GeneralCost) { if (elem != null) yield return new ElementValue("generalCost", elem); } - foreach (var elem in SpecificCost) { if (elem != null) yield return new ElementValue("specificCost", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1030,7 +904,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1058,7 +932,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1226,33 +1100,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (GroupSizeElement != null) yield return GroupSizeElement; - if (Cost != null) yield return Cost; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (GroupSizeElement != null) yield return new ElementValue("groupSize", GroupSizeElement); - if (Cost != null) yield return new ElementValue("cost", Cost); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1274,7 +1122,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1296,7 +1144,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1396,29 +1244,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - foreach (var elem in Benefit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - foreach (var elem in Benefit) { if (elem != null) yield return new ElementValue("benefit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1434,7 +1260,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1450,7 +1276,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -1548,29 +1374,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Cost) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Cost) { if (elem != null) yield return new ElementValue("cost", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1586,7 +1390,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1602,7 +1406,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1733,33 +1537,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Applicability != null) yield return Applicability; - foreach (var elem in Qualifiers) { if (elem != null) yield return elem; } - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Applicability != null) yield return new ElementValue("applicability", Applicability); - foreach (var elem in Qualifiers) { if (elem != null) yield return new ElementValue("qualifiers", elem); } - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1781,7 +1559,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1803,7 +1581,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2155,53 +1933,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (OwnedBy != null) yield return OwnedBy; - if (AdministeredBy != null) yield return AdministeredBy; - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in Coverage) { if (elem != null) yield return elem; } - foreach (var elem in Plan) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (OwnedBy != null) yield return new ElementValue("ownedBy", OwnedBy); - if (AdministeredBy != null) yield return new ElementValue("administeredBy", AdministeredBy); - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in Coverage) { if (elem != null) yield return new ElementValue("coverage", elem); } - foreach (var elem in Plan) { if (elem != null) yield return new ElementValue("plan", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2253,7 +1985,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2305,7 +2037,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs index c1de7c0093..8a151c0e0e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Invoice.cs @@ -189,29 +189,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -227,7 +205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -243,7 +221,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -378,31 +356,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (ChargeItem != null) yield return ChargeItem; - foreach (var elem in PriceComponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (ChargeItem != null) yield return new ElementValue("chargeItem", ChargeItem); - foreach (var elem in PriceComponent) { if (elem != null) yield return new ElementValue("priceComponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -421,7 +375,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -440,7 +394,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -608,33 +562,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Code != null) yield return Code; - if (FactorElement != null) yield return FactorElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Code != null) yield return new ElementValue("code", Code); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -656,7 +584,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -678,7 +606,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1074,57 +1002,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CancelledReasonElement != null) yield return CancelledReasonElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (Recipient != null) yield return Recipient; - if (DateElement != null) yield return DateElement; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Issuer != null) yield return Issuer; - if (Account != null) yield return Account; - foreach (var elem in LineItem) { if (elem != null) yield return elem; } - foreach (var elem in TotalPriceComponent) { if (elem != null) yield return elem; } - if (TotalNet != null) yield return TotalNet; - if (TotalGross != null) yield return TotalGross; - if (PaymentTermsElement != null) yield return PaymentTermsElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CancelledReasonElement != null) yield return new ElementValue("cancelledReason", CancelledReasonElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Recipient != null) yield return new ElementValue("recipient", Recipient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Issuer != null) yield return new ElementValue("issuer", Issuer); - if (Account != null) yield return new ElementValue("account", Account); - foreach (var elem in LineItem) { if (elem != null) yield return new ElementValue("lineItem", elem); } - foreach (var elem in TotalPriceComponent) { if (elem != null) yield return new ElementValue("totalPriceComponent", elem); } - if (TotalNet != null) yield return new ElementValue("totalNet", TotalNet); - if (TotalGross != null) yield return new ElementValue("totalGross", TotalGross); - if (PaymentTermsElement != null) yield return new ElementValue("paymentTerms", PaymentTermsElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1182,7 +1060,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1240,7 +1118,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Library.cs b/src/Hl7.Fhir.R4/Model/Generated/Library.cs index fcbed94a73..0fb97a839a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Library.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Library.cs @@ -893,87 +893,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in DataRequirement) { if (elem != null) yield return elem; } - foreach (var elem in Content) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in DataRequirement) { if (elem != null) yield return new ElementValue("dataRequirement", elem); } - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1076,7 +996,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1179,7 +1099,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs index 91fd395b19..d279db294a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Linkage.cs @@ -198,29 +198,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -236,7 +214,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -252,7 +230,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -369,31 +347,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActiveElement != null) yield return ActiveElement; - if (Author != null) yield return Author; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -412,7 +366,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -431,7 +385,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActiveElement is not null) yield return new KeyValuePair("active",ActiveElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/List.cs b/src/Hl7.Fhir.R4/Model/Generated/List.cs index e94fde4525..e513c03ea6 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/List.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/List.cs @@ -244,33 +244,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Flag != null) yield return Flag; - if (DeletedElement != null) yield return DeletedElement; - if (DateElement != null) yield return DateElement; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Flag != null) yield return new ElementValue("flag", Flag); - if (DeletedElement != null) yield return new ElementValue("deleted", DeletedElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -292,7 +266,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -314,7 +288,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Flag is not null) yield return new KeyValuePair("flag",Flag); @@ -667,51 +641,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ModeElement != null) yield return ModeElement; - if (TitleElement != null) yield return TitleElement; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - if (Source != null) yield return Source; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Entry) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Source != null) yield return new ElementValue("source", Source); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -760,7 +690,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -809,7 +739,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Location.cs b/src/Hl7.Fhir.R4/Model/Generated/Location.cs index c5453f90aa..c91792d878 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Location.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Location.cs @@ -268,31 +268,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LongitudeElement != null) yield return LongitudeElement; - if (LatitudeElement != null) yield return LatitudeElement; - if (AltitudeElement != null) yield return AltitudeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LongitudeElement != null) yield return new ElementValue("longitude", LongitudeElement); - if (LatitudeElement != null) yield return new ElementValue("latitude", LatitudeElement); - if (AltitudeElement != null) yield return new ElementValue("altitude", AltitudeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -311,7 +287,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -330,7 +306,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LongitudeElement is not null) yield return new KeyValuePair("longitude",LongitudeElement); @@ -535,33 +511,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return elem; } - if (AllDayElement != null) yield return AllDayElement; - if (OpeningTimeElement != null) yield return OpeningTimeElement; - if (ClosingTimeElement != null) yield return ClosingTimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return new ElementValue("daysOfWeek", elem); } - if (AllDayElement != null) yield return new ElementValue("allDay", AllDayElement); - if (OpeningTimeElement != null) yield return new ElementValue("openingTime", OpeningTimeElement); - if (ClosingTimeElement != null) yield return new ElementValue("closingTime", ClosingTimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -583,7 +533,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -605,7 +555,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DaysOfWeekElement?.Any() == true) yield return new KeyValuePair("daysOfWeek",DaysOfWeekElement); @@ -1059,59 +1009,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (OperationalStatus != null) yield return OperationalStatus; - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (ModeElement != null) yield return ModeElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - if (PhysicalType != null) yield return PhysicalType; - if (Position != null) yield return Position; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (PartOf != null) yield return PartOf; - foreach (var elem in HoursOfOperation) { if (elem != null) yield return elem; } - if (AvailabilityExceptionsElement != null) yield return AvailabilityExceptionsElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (OperationalStatus != null) yield return new ElementValue("operationalStatus", OperationalStatus); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - if (PhysicalType != null) yield return new ElementValue("physicalType", PhysicalType); - if (Position != null) yield return new ElementValue("position", Position); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - foreach (var elem in HoursOfOperation) { if (elem != null) yield return new ElementValue("hoursOfOperation", elem); } - if (AvailabilityExceptionsElement != null) yield return new ElementValue("availabilityExceptions", AvailabilityExceptionsElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1172,7 +1070,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1233,7 +1131,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MarketingStatus.cs b/src/Hl7.Fhir.R4/Model/Generated/MarketingStatus.cs index c06c653929..fac0cbe8f5 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MarketingStatus.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MarketingStatus.cs @@ -196,35 +196,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Country != null) yield return Country; - if (Jurisdiction != null) yield return Jurisdiction; - if (Status != null) yield return Status; - if (DateRange != null) yield return DateRange; - if (RestoreDateElement != null) yield return RestoreDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Country != null) yield return new ElementValue("country", Country); - if (Jurisdiction != null) yield return new ElementValue("jurisdiction", Jurisdiction); - if (Status != null) yield return new ElementValue("status", Status); - if (DateRange != null) yield return new ElementValue("dateRange", DateRange); - if (RestoreDateElement != null) yield return new ElementValue("restoreDate", RestoreDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -249,7 +221,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -274,7 +246,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Country is not null) yield return new KeyValuePair("country",Country); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Measure.cs b/src/Hl7.Fhir.R4/Model/Generated/Measure.cs index 3dfc3e8897..3c8af0ac4e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Measure.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Measure.cs @@ -198,33 +198,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Population) { if (elem != null) yield return elem; } - foreach (var elem in Stratifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - foreach (var elem in Stratifier) { if (elem != null) yield return new ElementValue("stratifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -246,7 +220,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -268,7 +242,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -402,31 +376,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -445,7 +395,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -464,7 +414,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -612,33 +562,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -660,7 +584,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -682,7 +606,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -816,31 +740,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -859,7 +759,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -878,7 +778,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1029,33 +929,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Usage) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Usage) { if (elem != null) yield return new ElementValue("usage", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1077,7 +951,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1099,7 +973,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -2252,107 +2126,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (DisclaimerElement != null) yield return DisclaimerElement; - if (Scoring != null) yield return Scoring; - if (CompositeScoring != null) yield return CompositeScoring; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (RiskAdjustmentElement != null) yield return RiskAdjustmentElement; - if (RateAggregationElement != null) yield return RateAggregationElement; - if (RationaleElement != null) yield return RationaleElement; - if (ClinicalRecommendationStatementElement != null) yield return ClinicalRecommendationStatementElement; - if (ImprovementNotation != null) yield return ImprovementNotation; - foreach (var elem in DefinitionElement) { if (elem != null) yield return elem; } - if (GuidanceElement != null) yield return GuidanceElement; - foreach (var elem in Group) { if (elem != null) yield return elem; } - foreach (var elem in SupplementalData) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (DisclaimerElement != null) yield return new ElementValue("disclaimer", DisclaimerElement); - if (Scoring != null) yield return new ElementValue("scoring", Scoring); - if (CompositeScoring != null) yield return new ElementValue("compositeScoring", CompositeScoring); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (RiskAdjustmentElement != null) yield return new ElementValue("riskAdjustment", RiskAdjustmentElement); - if (RateAggregationElement != null) yield return new ElementValue("rateAggregation", RateAggregationElement); - if (RationaleElement != null) yield return new ElementValue("rationale", RationaleElement); - if (ClinicalRecommendationStatementElement != null) yield return new ElementValue("clinicalRecommendationStatement", ClinicalRecommendationStatementElement); - if (ImprovementNotation != null) yield return new ElementValue("improvementNotation", ImprovementNotation); - foreach (var elem in DefinitionElement) { if (elem != null) yield return new ElementValue("definition", elem); } - if (GuidanceElement != null) yield return new ElementValue("guidance", GuidanceElement); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - foreach (var elem in SupplementalData) { if (elem != null) yield return new ElementValue("supplementalData", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2485,7 +2259,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2618,7 +2392,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs index 425dac26f3..9f44124314 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MeasureReport.cs @@ -242,33 +242,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Population) { if (elem != null) yield return elem; } - if (MeasureScore != null) yield return MeasureScore; - foreach (var elem in Stratifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - if (MeasureScore != null) yield return new ElementValue("measureScore", MeasureScore); - foreach (var elem in Stratifier) { if (elem != null) yield return new ElementValue("stratifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -290,7 +264,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -312,7 +286,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -447,31 +421,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (CountElement != null) yield return CountElement; - if (SubjectResults != null) yield return SubjectResults; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (SubjectResults != null) yield return new ElementValue("subjectResults", SubjectResults); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -490,7 +440,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -509,7 +459,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -608,29 +558,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Stratum) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Stratum) { if (elem != null) yield return new ElementValue("stratum", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -646,7 +574,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -662,7 +590,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -792,33 +720,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - foreach (var elem in Component) { if (elem != null) yield return elem; } - foreach (var elem in Population) { if (elem != null) yield return elem; } - if (MeasureScore != null) yield return MeasureScore; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - if (MeasureScore != null) yield return new ElementValue("measureScore", MeasureScore); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -840,7 +742,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -862,7 +764,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -962,29 +864,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1000,7 +880,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1016,7 +896,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1149,31 +1029,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (CountElement != null) yield return CountElement; - if (SubjectResults != null) yield return SubjectResults; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (SubjectResults != null) yield return new ElementValue("subjectResults", SubjectResults); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1192,7 +1048,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1211,7 +1067,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1528,47 +1384,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (TypeElement != null) yield return TypeElement; - if (MeasureElement != null) yield return MeasureElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (Reporter != null) yield return Reporter; - if (Period != null) yield return Period; - if (ImprovementNotation != null) yield return ImprovementNotation; - foreach (var elem in Group) { if (elem != null) yield return elem; } - foreach (var elem in EvaluatedResource) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (MeasureElement != null) yield return new ElementValue("measure", MeasureElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Reporter != null) yield return new ElementValue("reporter", Reporter); - if (Period != null) yield return new ElementValue("period", Period); - if (ImprovementNotation != null) yield return new ElementValue("improvementNotation", ImprovementNotation); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - foreach (var elem in EvaluatedResource) { if (elem != null) yield return new ElementValue("evaluatedResource", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1611,7 +1427,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1654,7 +1470,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Media.cs b/src/Hl7.Fhir.R4/Model/Generated/Media.cs index a7eb0aff32..26cbcf7a46 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Media.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Media.cs @@ -603,69 +603,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Modality != null) yield return Modality; - if (View != null) yield return View; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Created != null) yield return Created; - if (IssuedElement != null) yield return IssuedElement; - if (Operator != null) yield return Operator; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (DeviceNameElement != null) yield return DeviceNameElement; - if (Device != null) yield return Device; - if (HeightElement != null) yield return HeightElement; - if (WidthElement != null) yield return WidthElement; - if (FramesElement != null) yield return FramesElement; - if (DurationElement != null) yield return DurationElement; - if (Content != null) yield return Content; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Modality != null) yield return new ElementValue("modality", Modality); - if (View != null) yield return new ElementValue("view", View); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Created != null) yield return new ElementValue("created", Created); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Operator != null) yield return new ElementValue("operator", Operator); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (DeviceNameElement != null) yield return new ElementValue("deviceName", DeviceNameElement); - if (Device != null) yield return new ElementValue("device", Device); - if (HeightElement != null) yield return new ElementValue("height", HeightElement); - if (WidthElement != null) yield return new ElementValue("width", WidthElement); - if (FramesElement != null) yield return new ElementValue("frames", FramesElement); - if (DurationElement != null) yield return new ElementValue("duration", DurationElement); - if (Content != null) yield return new ElementValue("content", Content); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -741,7 +679,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -817,7 +755,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Medication.cs b/src/Hl7.Fhir.R4/Model/Generated/Medication.cs index 38d6b8fc0c..b74fbf24fc 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Medication.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Medication.cs @@ -213,31 +213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (IsActiveElement != null) yield return IsActiveElement; - if (Strength != null) yield return Strength; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (IsActiveElement != null) yield return new ElementValue("isActive", IsActiveElement); - if (Strength != null) yield return new ElementValue("strength", Strength); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -256,7 +232,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -275,7 +251,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -408,29 +384,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -446,7 +400,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -462,7 +416,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LotNumberElement is not null) yield return new KeyValuePair("lotNumber",LotNumberElement); @@ -669,41 +623,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (StatusElement != null) yield return StatusElement; - if (Manufacturer != null) yield return Manufacturer; - if (Form != null) yield return Form; - if (Amount != null) yield return Amount; - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - if (Batch != null) yield return Batch; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - if (Form != null) yield return new ElementValue("form", Form); - if (Amount != null) yield return new ElementValue("amount", Amount); - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - if (Batch != null) yield return new ElementValue("batch", Batch); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -737,7 +657,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -771,7 +691,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs index eb304c6d72..6d11d1a123 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationAdministration.cs @@ -202,29 +202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -240,7 +218,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -256,7 +234,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -439,37 +417,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TextElement != null) yield return TextElement; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (Method != null) yield return Method; - if (Dose != null) yield return Dose; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (Method != null) yield return new ElementValue("method", Method); - if (Dose != null) yield return new ElementValue("dose", Dose); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -497,7 +445,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -525,7 +473,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TextElement is not null) yield return new KeyValuePair("text",TextElement); @@ -964,63 +912,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusReason) { if (elem != null) yield return elem; } - if (Category != null) yield return Category; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (Effective != null) yield return Effective; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (Request != null) yield return Request; - foreach (var elem in Device) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Dosage != null) yield return Dosage; - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return new ElementValue("instantiates", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusReason) { if (elem != null) yield return new ElementValue("statusReason", elem); } - if (Category != null) yield return new ElementValue("category", Category); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (Effective != null) yield return new ElementValue("effective", Effective); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (Request != null) yield return new ElementValue("request", Request); - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Dosage != null) yield return new ElementValue("dosage", Dosage); - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1087,7 +979,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1154,7 +1046,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs index f674642ba5..da431be1b0 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationDispense.cs @@ -214,29 +214,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -252,7 +230,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -268,7 +246,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -421,33 +399,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (WasSubstitutedElement != null) yield return WasSubstitutedElement; - if (Type != null) yield return Type; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in ResponsibleParty) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (WasSubstitutedElement != null) yield return new ElementValue("wasSubstituted", WasSubstitutedElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in ResponsibleParty) { if (elem != null) yield return new ElementValue("responsibleParty", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -469,7 +421,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -491,7 +443,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (WasSubstitutedElement is not null) yield return new KeyValuePair("wasSubstituted",WasSubstitutedElement); @@ -1028,73 +980,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (Category != null) yield return Category; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in AuthorizingPrescription) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - if (DaysSupply != null) yield return DaysSupply; - if (WhenPreparedElement != null) yield return WhenPreparedElement; - if (WhenHandedOverElement != null) yield return WhenHandedOverElement; - if (Destination != null) yield return Destination; - foreach (var elem in Receiver) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in DosageInstruction) { if (elem != null) yield return elem; } - if (Substitution != null) yield return Substitution; - foreach (var elem in DetectedIssue) { if (elem != null) yield return elem; } - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (Category != null) yield return new ElementValue("category", Category); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in AuthorizingPrescription) { if (elem != null) yield return new ElementValue("authorizingPrescription", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (DaysSupply != null) yield return new ElementValue("daysSupply", DaysSupply); - if (WhenPreparedElement != null) yield return new ElementValue("whenPrepared", WhenPreparedElement); - if (WhenHandedOverElement != null) yield return new ElementValue("whenHandedOver", WhenHandedOverElement); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Receiver) { if (elem != null) yield return new ElementValue("receiver", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in DosageInstruction) { if (elem != null) yield return new ElementValue("dosageInstruction", elem); } - if (Substitution != null) yield return new ElementValue("substitution", Substitution); - foreach (var elem in DetectedIssue) { if (elem != null) yield return new ElementValue("detectedIssue", elem); } - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1176,7 +1062,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1258,7 +1144,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs index 62d7f1cbf8..5cb1435552 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationKnowledge.cs @@ -178,29 +178,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Reference) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Reference) { if (elem != null) yield return new ElementValue("reference", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -216,7 +194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -232,7 +210,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -327,29 +305,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Source != null) yield return Source; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Source != null) yield return new ElementValue("source", Source); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -365,7 +321,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -381,7 +337,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -515,31 +471,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (IsActiveElement != null) yield return IsActiveElement; - if (Strength != null) yield return Strength; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (IsActiveElement != null) yield return new ElementValue("isActive", IsActiveElement); - if (Strength != null) yield return new ElementValue("strength", Strength); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -558,7 +490,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -577,7 +509,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -710,31 +642,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (SourceElement != null) yield return SourceElement; - if (Cost != null) yield return Cost; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (Cost != null) yield return new ElementValue("cost", Cost); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -753,7 +661,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -772,7 +680,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -887,29 +795,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (NameElement != null) yield return NameElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (NameElement != null) yield return new ElementValue("name", NameElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -925,7 +811,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -941,7 +827,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1058,31 +944,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - if (Indication != null) yield return Indication; - foreach (var elem in PatientCharacteristics) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - if (Indication != null) yield return new ElementValue("indication", Indication); - foreach (var elem in PatientCharacteristics) { if (elem != null) yield return new ElementValue("patientCharacteristics", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1101,7 +963,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1120,7 +982,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Dosage?.Any() == true) yield return new KeyValuePair("dosage",Dosage); @@ -1216,29 +1078,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1254,7 +1094,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1270,7 +1110,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1388,29 +1228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Characteristic != null) yield return Characteristic; - foreach (var elem in ValueElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Characteristic != null) yield return new ElementValue("characteristic", Characteristic); - foreach (var elem in ValueElement) { if (elem != null) yield return new ElementValue("value", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1426,7 +1244,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1442,7 +1260,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Characteristic is not null) yield return new KeyValuePair("characteristic",Characteristic); @@ -1537,29 +1355,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Classification) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1575,7 +1371,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1591,7 +1387,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1688,29 +1484,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1726,7 +1500,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1742,7 +1516,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1841,29 +1615,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1879,7 +1631,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1895,7 +1647,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2025,33 +1777,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RegulatoryAuthority != null) yield return RegulatoryAuthority; - foreach (var elem in Substitution) { if (elem != null) yield return elem; } - foreach (var elem in Schedule) { if (elem != null) yield return elem; } - if (MaxDispense != null) yield return MaxDispense; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RegulatoryAuthority != null) yield return new ElementValue("regulatoryAuthority", RegulatoryAuthority); - foreach (var elem in Substitution) { if (elem != null) yield return new ElementValue("substitution", elem); } - foreach (var elem in Schedule) { if (elem != null) yield return new ElementValue("schedule", elem); } - if (MaxDispense != null) yield return new ElementValue("maxDispense", MaxDispense); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2073,7 +1799,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2095,7 +1821,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RegulatoryAuthority is not null) yield return new KeyValuePair("regulatoryAuthority",RegulatoryAuthority); @@ -2210,29 +1936,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (AllowedElement != null) yield return AllowedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (AllowedElement != null) yield return new ElementValue("allowed", AllowedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2248,7 +1952,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2264,7 +1968,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2342,27 +2046,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Schedule != null) yield return Schedule; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2375,7 +2059,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2388,7 +2072,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Schedule is not null) yield return new KeyValuePair("schedule",Schedule); @@ -2481,29 +2165,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2519,7 +2181,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2535,7 +2197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -2646,31 +2308,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in AreaUnderCurve) { if (elem != null) yield return elem; } - foreach (var elem in LethalDose50) { if (elem != null) yield return elem; } - if (HalfLifePeriod != null) yield return HalfLifePeriod; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in AreaUnderCurve) { if (elem != null) yield return new ElementValue("areaUnderCurve", elem); } - foreach (var elem in LethalDose50) { if (elem != null) yield return new ElementValue("lethalDose50", elem); } - if (HalfLifePeriod != null) yield return new ElementValue("halfLifePeriod", HalfLifePeriod); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2689,7 +2327,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2708,7 +2346,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AreaUnderCurve?.Any() == true) yield return new KeyValuePair("areaUnderCurve",AreaUnderCurve); @@ -3192,69 +2830,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (StatusElement != null) yield return StatusElement; - if (Manufacturer != null) yield return Manufacturer; - if (DoseForm != null) yield return DoseForm; - if (Amount != null) yield return Amount; - foreach (var elem in SynonymElement) { if (elem != null) yield return elem; } - foreach (var elem in RelatedMedicationKnowledge) { if (elem != null) yield return elem; } - foreach (var elem in AssociatedMedication) { if (elem != null) yield return elem; } - foreach (var elem in ProductType) { if (elem != null) yield return elem; } - foreach (var elem in Monograph) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - if (PreparationInstructionElement != null) yield return PreparationInstructionElement; - foreach (var elem in IntendedRoute) { if (elem != null) yield return elem; } - foreach (var elem in Cost) { if (elem != null) yield return elem; } - foreach (var elem in MonitoringProgram) { if (elem != null) yield return elem; } - foreach (var elem in AdministrationGuidelines) { if (elem != null) yield return elem; } - foreach (var elem in MedicineClassification) { if (elem != null) yield return elem; } - if (Packaging != null) yield return Packaging; - foreach (var elem in DrugCharacteristic) { if (elem != null) yield return elem; } - foreach (var elem in Contraindication) { if (elem != null) yield return elem; } - foreach (var elem in Regulatory) { if (elem != null) yield return elem; } - foreach (var elem in Kinetics) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - if (DoseForm != null) yield return new ElementValue("doseForm", DoseForm); - if (Amount != null) yield return new ElementValue("amount", Amount); - foreach (var elem in SynonymElement) { if (elem != null) yield return new ElementValue("synonym", elem); } - foreach (var elem in RelatedMedicationKnowledge) { if (elem != null) yield return new ElementValue("relatedMedicationKnowledge", elem); } - foreach (var elem in AssociatedMedication) { if (elem != null) yield return new ElementValue("associatedMedication", elem); } - foreach (var elem in ProductType) { if (elem != null) yield return new ElementValue("productType", elem); } - foreach (var elem in Monograph) { if (elem != null) yield return new ElementValue("monograph", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - if (PreparationInstructionElement != null) yield return new ElementValue("preparationInstruction", PreparationInstructionElement); - foreach (var elem in IntendedRoute) { if (elem != null) yield return new ElementValue("intendedRoute", elem); } - foreach (var elem in Cost) { if (elem != null) yield return new ElementValue("cost", elem); } - foreach (var elem in MonitoringProgram) { if (elem != null) yield return new ElementValue("monitoringProgram", elem); } - foreach (var elem in AdministrationGuidelines) { if (elem != null) yield return new ElementValue("administrationGuidelines", elem); } - foreach (var elem in MedicineClassification) { if (elem != null) yield return new ElementValue("medicineClassification", elem); } - if (Packaging != null) yield return new ElementValue("packaging", Packaging); - foreach (var elem in DrugCharacteristic) { if (elem != null) yield return new ElementValue("drugCharacteristic", elem); } - foreach (var elem in Contraindication) { if (elem != null) yield return new ElementValue("contraindication", elem); } - foreach (var elem in Regulatory) { if (elem != null) yield return new ElementValue("regulatory", elem); } - foreach (var elem in Kinetics) { if (elem != null) yield return new ElementValue("kinetics", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3330,7 +2906,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3406,7 +2982,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs index d86c52ec56..df4bb5476a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationRequest.cs @@ -362,39 +362,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (InitialFill != null) yield return InitialFill; - if (DispenseInterval != null) yield return DispenseInterval; - if (ValidityPeriod != null) yield return ValidityPeriod; - if (NumberOfRepeatsAllowedElement != null) yield return NumberOfRepeatsAllowedElement; - if (Quantity != null) yield return Quantity; - if (ExpectedSupplyDuration != null) yield return ExpectedSupplyDuration; - if (Performer != null) yield return Performer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (InitialFill != null) yield return new ElementValue("initialFill", InitialFill); - if (DispenseInterval != null) yield return new ElementValue("dispenseInterval", DispenseInterval); - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - if (NumberOfRepeatsAllowedElement != null) yield return new ElementValue("numberOfRepeatsAllowed", NumberOfRepeatsAllowedElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (ExpectedSupplyDuration != null) yield return new ElementValue("expectedSupplyDuration", ExpectedSupplyDuration); - if (Performer != null) yield return new ElementValue("performer", Performer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -425,7 +393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -456,7 +424,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (InitialFill is not null) yield return new KeyValuePair("initialFill",InitialFill); @@ -558,29 +526,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Duration != null) yield return Duration; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Duration != null) yield return new ElementValue("duration", Duration); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -596,7 +542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -612,7 +558,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -713,29 +659,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Allowed != null) yield return Allowed; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -751,7 +675,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -767,7 +691,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Allowed is not null) yield return new KeyValuePair("allowed",Allowed); @@ -1517,89 +1441,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Reported != null) yield return Reported; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (Performer != null) yield return Performer; - if (PerformerType != null) yield return PerformerType; - if (Recorder != null) yield return Recorder; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (CourseOfTherapyType != null) yield return CourseOfTherapyType; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in DosageInstruction) { if (elem != null) yield return elem; } - if (DispenseRequest != null) yield return DispenseRequest; - if (Substitution != null) yield return Substitution; - if (PriorPrescription != null) yield return PriorPrescription; - foreach (var elem in DetectedIssue) { if (elem != null) yield return elem; } - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Reported != null) yield return new ElementValue("reported", Reported); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (Performer != null) yield return new ElementValue("performer", Performer); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (CourseOfTherapyType != null) yield return new ElementValue("courseOfTherapyType", CourseOfTherapyType); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in DosageInstruction) { if (elem != null) yield return new ElementValue("dosageInstruction", elem); } - if (DispenseRequest != null) yield return new ElementValue("dispenseRequest", DispenseRequest); - if (Substitution != null) yield return new ElementValue("substitution", Substitution); - if (PriorPrescription != null) yield return new ElementValue("priorPrescription", PriorPrescription); - foreach (var elem in DetectedIssue) { if (elem != null) yield return new ElementValue("detectedIssue", elem); } - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1705,7 +1547,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1811,7 +1653,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs index db362d1fa2..9e041e0ca8 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicationStatement.cs @@ -517,59 +517,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusReason) { if (elem != null) yield return elem; } - if (Category != null) yield return Category; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Effective != null) yield return Effective; - if (DateAssertedElement != null) yield return DateAssertedElement; - if (InformationSource != null) yield return InformationSource; - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusReason) { if (elem != null) yield return new ElementValue("statusReason", elem); } - if (Category != null) yield return new ElementValue("category", Category); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (DateAssertedElement != null) yield return new ElementValue("dateAsserted", DateAssertedElement); - if (InformationSource != null) yield return new ElementValue("informationSource", InformationSource); - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -630,7 +578,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -691,7 +639,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs index fdbd9e569a..52281f68ef 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProduct.cs @@ -177,31 +177,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductNameElement != null) yield return ProductNameElement; - foreach (var elem in NamePart) { if (elem != null) yield return elem; } - foreach (var elem in CountryLanguage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductNameElement != null) yield return new ElementValue("productName", ProductNameElement); - foreach (var elem in NamePart) { if (elem != null) yield return new ElementValue("namePart", elem); } - foreach (var elem in CountryLanguage) { if (elem != null) yield return new ElementValue("countryLanguage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -220,7 +196,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -239,7 +215,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductNameElement is not null) yield return new KeyValuePair("productName",ProductNameElement); @@ -353,29 +329,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PartElement != null) yield return PartElement; - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PartElement != null) yield return new ElementValue("part", PartElement); - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -391,7 +345,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -407,7 +361,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PartElement is not null) yield return new KeyValuePair("part",PartElement); @@ -518,31 +472,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Country != null) yield return Country; - if (Jurisdiction != null) yield return Jurisdiction; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Country != null) yield return new ElementValue("country", Country); - if (Jurisdiction != null) yield return new ElementValue("jurisdiction", Jurisdiction); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -561,7 +491,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -580,7 +510,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Country is not null) yield return new KeyValuePair("country",Country); @@ -761,37 +691,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (OperationType != null) yield return OperationType; - if (AuthorisationReferenceNumber != null) yield return AuthorisationReferenceNumber; - if (EffectiveDateElement != null) yield return EffectiveDateElement; - if (ConfidentialityIndicator != null) yield return ConfidentialityIndicator; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - if (Regulator != null) yield return Regulator; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (OperationType != null) yield return new ElementValue("operationType", OperationType); - if (AuthorisationReferenceNumber != null) yield return new ElementValue("authorisationReferenceNumber", AuthorisationReferenceNumber); - if (EffectiveDateElement != null) yield return new ElementValue("effectiveDate", EffectiveDateElement); - if (ConfidentialityIndicator != null) yield return new ElementValue("confidentialityIndicator", ConfidentialityIndicator); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - if (Regulator != null) yield return new ElementValue("regulator", Regulator); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -819,7 +719,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -847,7 +747,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (OperationType is not null) yield return new KeyValuePair("operationType",OperationType); @@ -1046,39 +946,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (IntendedUse != null) yield return IntendedUse; - if (Indication != null) yield return Indication; - if (Status != null) yield return Status; - if (DateElement != null) yield return DateElement; - if (Species != null) yield return Species; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (IntendedUse != null) yield return new ElementValue("intendedUse", IntendedUse); - if (Indication != null) yield return new ElementValue("indication", Indication); - if (Status != null) yield return new ElementValue("status", Status); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Species != null) yield return new ElementValue("species", Species); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1109,7 +977,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1140,7 +1008,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1559,65 +1427,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Domain != null) yield return Domain; - if (CombinedPharmaceuticalDoseForm != null) yield return CombinedPharmaceuticalDoseForm; - if (LegalStatusOfSupply != null) yield return LegalStatusOfSupply; - if (AdditionalMonitoringIndicator != null) yield return AdditionalMonitoringIndicator; - foreach (var elem in SpecialMeasuresElement) { if (elem != null) yield return elem; } - if (PaediatricUseIndicator != null) yield return PaediatricUseIndicator; - foreach (var elem in ProductClassification) { if (elem != null) yield return elem; } - foreach (var elem in MarketingStatus) { if (elem != null) yield return elem; } - foreach (var elem in PharmaceuticalProduct) { if (elem != null) yield return elem; } - foreach (var elem in PackagedMedicinalProduct) { if (elem != null) yield return elem; } - foreach (var elem in AttachedDocument) { if (elem != null) yield return elem; } - foreach (var elem in MasterFile) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in ClinicalTrial) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in CrossReference) { if (elem != null) yield return elem; } - foreach (var elem in ManufacturingBusinessOperation) { if (elem != null) yield return elem; } - foreach (var elem in SpecialDesignation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Domain != null) yield return new ElementValue("domain", Domain); - if (CombinedPharmaceuticalDoseForm != null) yield return new ElementValue("combinedPharmaceuticalDoseForm", CombinedPharmaceuticalDoseForm); - if (LegalStatusOfSupply != null) yield return new ElementValue("legalStatusOfSupply", LegalStatusOfSupply); - if (AdditionalMonitoringIndicator != null) yield return new ElementValue("additionalMonitoringIndicator", AdditionalMonitoringIndicator); - foreach (var elem in SpecialMeasuresElement) { if (elem != null) yield return new ElementValue("specialMeasures", elem); } - if (PaediatricUseIndicator != null) yield return new ElementValue("paediatricUseIndicator", PaediatricUseIndicator); - foreach (var elem in ProductClassification) { if (elem != null) yield return new ElementValue("productClassification", elem); } - foreach (var elem in MarketingStatus) { if (elem != null) yield return new ElementValue("marketingStatus", elem); } - foreach (var elem in PharmaceuticalProduct) { if (elem != null) yield return new ElementValue("pharmaceuticalProduct", elem); } - foreach (var elem in PackagedMedicinalProduct) { if (elem != null) yield return new ElementValue("packagedMedicinalProduct", elem); } - foreach (var elem in AttachedDocument) { if (elem != null) yield return new ElementValue("attachedDocument", elem); } - foreach (var elem in MasterFile) { if (elem != null) yield return new ElementValue("masterFile", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in ClinicalTrial) { if (elem != null) yield return new ElementValue("clinicalTrial", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in CrossReference) { if (elem != null) yield return new ElementValue("crossReference", elem); } - foreach (var elem in ManufacturingBusinessOperation) { if (elem != null) yield return new ElementValue("manufacturingBusinessOperation", elem); } - foreach (var elem in SpecialDesignation) { if (elem != null) yield return new ElementValue("specialDesignation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1687,7 +1497,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1757,7 +1567,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs index e1eae3fd09..9fde8f9122 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductAuthorization.cs @@ -190,35 +190,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Country != null) yield return Country; - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (LegalStatusOfSupply != null) yield return LegalStatusOfSupply; - if (ValidityPeriod != null) yield return ValidityPeriod; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Country != null) yield return new ElementValue("country", Country); - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (LegalStatusOfSupply != null) yield return new ElementValue("legalStatusOfSupply", LegalStatusOfSupply); - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -243,7 +215,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -268,7 +240,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -400,33 +372,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Type != null) yield return Type; - if (Date != null) yield return Date; - foreach (var elem in Application) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Type != null) yield return new ElementValue("type", Type); - if (Date != null) yield return new ElementValue("date", Date); - foreach (var elem in Application) { if (elem != null) yield return new ElementValue("application", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -448,7 +394,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -470,7 +416,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -860,57 +806,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in Country) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - if (RestoreDateElement != null) yield return RestoreDateElement; - if (ValidityPeriod != null) yield return ValidityPeriod; - if (DataExclusivityPeriod != null) yield return DataExclusivityPeriod; - if (DateOfFirstAuthorizationElement != null) yield return DateOfFirstAuthorizationElement; - if (InternationalBirthDateElement != null) yield return InternationalBirthDateElement; - if (LegalBasis != null) yield return LegalBasis; - foreach (var elem in JurisdictionalAuthorization) { if (elem != null) yield return elem; } - if (Holder != null) yield return Holder; - if (Regulator != null) yield return Regulator; - if (Procedure != null) yield return Procedure; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Country) { if (elem != null) yield return new ElementValue("country", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (RestoreDateElement != null) yield return new ElementValue("restoreDate", RestoreDateElement); - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - if (DataExclusivityPeriod != null) yield return new ElementValue("dataExclusivityPeriod", DataExclusivityPeriod); - if (DateOfFirstAuthorizationElement != null) yield return new ElementValue("dateOfFirstAuthorization", DateOfFirstAuthorizationElement); - if (InternationalBirthDateElement != null) yield return new ElementValue("internationalBirthDate", InternationalBirthDateElement); - if (LegalBasis != null) yield return new ElementValue("legalBasis", LegalBasis); - foreach (var elem in JurisdictionalAuthorization) { if (elem != null) yield return new ElementValue("jurisdictionalAuthorization", elem); } - if (Holder != null) yield return new ElementValue("holder", Holder); - if (Regulator != null) yield return new ElementValue("regulator", Regulator); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -968,7 +864,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1026,7 +922,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs index a88e03ec7a..e5d23f8fb5 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductContraindication.cs @@ -148,29 +148,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TherapyRelationshipType != null) yield return TherapyRelationshipType; - if (Medication != null) yield return Medication; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TherapyRelationshipType != null) yield return new ElementValue("therapyRelationshipType", TherapyRelationshipType); - if (Medication != null) yield return new ElementValue("medication", Medication); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -186,7 +164,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -202,7 +180,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TherapyRelationshipType is not null) yield return new KeyValuePair("therapyRelationshipType",TherapyRelationshipType); @@ -371,39 +349,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Disease != null) yield return Disease; - if (DiseaseStatus != null) yield return DiseaseStatus; - foreach (var elem in Comorbidity) { if (elem != null) yield return elem; } - foreach (var elem in TherapeuticIndication) { if (elem != null) yield return elem; } - foreach (var elem in OtherTherapy) { if (elem != null) yield return elem; } - foreach (var elem in Population) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Disease != null) yield return new ElementValue("disease", Disease); - if (DiseaseStatus != null) yield return new ElementValue("diseaseStatus", DiseaseStatus); - foreach (var elem in Comorbidity) { if (elem != null) yield return new ElementValue("comorbidity", elem); } - foreach (var elem in TherapeuticIndication) { if (elem != null) yield return new ElementValue("therapeuticIndication", elem); } - foreach (var elem in OtherTherapy) { if (elem != null) yield return new ElementValue("otherTherapy", elem); } - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -434,7 +380,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -465,7 +411,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Subject?.Any() == true) yield return new KeyValuePair("subject",Subject); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs index 7e58250f70..a268dcb540 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIndication.cs @@ -148,29 +148,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TherapyRelationshipType != null) yield return TherapyRelationshipType; - if (Medication != null) yield return Medication; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TherapyRelationshipType != null) yield return new ElementValue("therapyRelationshipType", TherapyRelationshipType); - if (Medication != null) yield return new ElementValue("medication", Medication); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -186,7 +164,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -202,7 +180,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TherapyRelationshipType is not null) yield return new KeyValuePair("therapyRelationshipType",TherapyRelationshipType); @@ -403,43 +381,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (DiseaseSymptomProcedure != null) yield return DiseaseSymptomProcedure; - if (DiseaseStatus != null) yield return DiseaseStatus; - foreach (var elem in Comorbidity) { if (elem != null) yield return elem; } - if (IntendedEffect != null) yield return IntendedEffect; - if (Duration != null) yield return Duration; - foreach (var elem in OtherTherapy) { if (elem != null) yield return elem; } - foreach (var elem in UndesirableEffect) { if (elem != null) yield return elem; } - foreach (var elem in Population) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (DiseaseSymptomProcedure != null) yield return new ElementValue("diseaseSymptomProcedure", DiseaseSymptomProcedure); - if (DiseaseStatus != null) yield return new ElementValue("diseaseStatus", DiseaseStatus); - foreach (var elem in Comorbidity) { if (elem != null) yield return new ElementValue("comorbidity", elem); } - if (IntendedEffect != null) yield return new ElementValue("intendedEffect", IntendedEffect); - if (Duration != null) yield return new ElementValue("duration", Duration); - foreach (var elem in OtherTherapy) { if (elem != null) yield return new ElementValue("otherTherapy", elem); } - foreach (var elem in UndesirableEffect) { if (elem != null) yield return new ElementValue("undesirableEffect", elem); } - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -476,7 +418,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -513,7 +455,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Subject?.Any() == true) yield return new KeyValuePair("subject",Subject); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs index 7dd2f43bce..a80560c3c7 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductIngredient.cs @@ -175,33 +175,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Group != null) yield return Group; - if (Confidentiality != null) yield return Confidentiality; - foreach (var elem in Strength) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Group != null) yield return new ElementValue("group", Group); - if (Confidentiality != null) yield return new ElementValue("confidentiality", Confidentiality); - foreach (var elem in Strength) { if (elem != null) yield return new ElementValue("strength", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -223,7 +197,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -245,7 +219,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -441,39 +415,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Presentation != null) yield return Presentation; - if (PresentationLowLimit != null) yield return PresentationLowLimit; - if (Concentration != null) yield return Concentration; - if (ConcentrationLowLimit != null) yield return ConcentrationLowLimit; - if (MeasurementPointElement != null) yield return MeasurementPointElement; - foreach (var elem in Country) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceStrength) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Presentation != null) yield return new ElementValue("presentation", Presentation); - if (PresentationLowLimit != null) yield return new ElementValue("presentationLowLimit", PresentationLowLimit); - if (Concentration != null) yield return new ElementValue("concentration", Concentration); - if (ConcentrationLowLimit != null) yield return new ElementValue("concentrationLowLimit", ConcentrationLowLimit); - if (MeasurementPointElement != null) yield return new ElementValue("measurementPoint", MeasurementPointElement); - foreach (var elem in Country) { if (elem != null) yield return new ElementValue("country", elem); } - foreach (var elem in ReferenceStrength) { if (elem != null) yield return new ElementValue("referenceStrength", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -504,7 +446,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -535,7 +477,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Presentation is not null) yield return new KeyValuePair("presentation",Presentation); @@ -701,35 +643,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - if (Strength != null) yield return Strength; - if (StrengthLowLimit != null) yield return StrengthLowLimit; - if (MeasurementPointElement != null) yield return MeasurementPointElement; - foreach (var elem in Country) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - if (Strength != null) yield return new ElementValue("strength", Strength); - if (StrengthLowLimit != null) yield return new ElementValue("strengthLowLimit", StrengthLowLimit); - if (MeasurementPointElement != null) yield return new ElementValue("measurementPoint", MeasurementPointElement); - foreach (var elem in Country) { if (elem != null) yield return new ElementValue("country", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -754,7 +668,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -779,7 +693,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -877,29 +791,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Strength) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Strength) { if (elem != null) yield return new ElementValue("strength", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -915,7 +807,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -931,7 +823,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1100,37 +992,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Role != null) yield return Role; - if (AllergenicIndicatorElement != null) yield return AllergenicIndicatorElement; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in SpecifiedSubstance) { if (elem != null) yield return elem; } - if (Substance != null) yield return Substance; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Role != null) yield return new ElementValue("role", Role); - if (AllergenicIndicatorElement != null) yield return new ElementValue("allergenicIndicator", AllergenicIndicatorElement); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in SpecifiedSubstance) { if (elem != null) yield return new ElementValue("specifiedSubstance", elem); } - if (Substance != null) yield return new ElementValue("substance", Substance); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1158,7 +1020,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1186,7 +1048,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs index 2274a26d20..95c7bb41dc 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductInteraction.cs @@ -131,27 +131,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -164,7 +144,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -177,7 +157,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -358,39 +338,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Interactant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Effect != null) yield return Effect; - if (Incidence != null) yield return Incidence; - if (Management != null) yield return Management; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Interactant) { if (elem != null) yield return new ElementValue("interactant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Effect != null) yield return new ElementValue("effect", Effect); - if (Incidence != null) yield return new ElementValue("incidence", Incidence); - if (Management != null) yield return new ElementValue("management", Management); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -421,7 +369,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -452,7 +400,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Subject?.Any() == true) yield return new KeyValuePair("subject",Subject); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs index e10313c783..afe49afe2a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductManufactured.cs @@ -216,39 +216,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ManufacturedDoseForm != null) yield return ManufacturedDoseForm; - if (UnitOfPresentation != null) yield return UnitOfPresentation; - if (Quantity != null) yield return Quantity; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - if (PhysicalCharacteristics != null) yield return PhysicalCharacteristics; - foreach (var elem in OtherCharacteristics) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ManufacturedDoseForm != null) yield return new ElementValue("manufacturedDoseForm", ManufacturedDoseForm); - if (UnitOfPresentation != null) yield return new ElementValue("unitOfPresentation", UnitOfPresentation); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - if (PhysicalCharacteristics != null) yield return new ElementValue("physicalCharacteristics", PhysicalCharacteristics); - foreach (var elem in OtherCharacteristics) { if (elem != null) yield return new ElementValue("otherCharacteristics", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -279,7 +247,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -310,7 +278,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ManufacturedDoseForm is not null) yield return new KeyValuePair("manufacturedDoseForm",ManufacturedDoseForm); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs index c3d4326e12..38163def71 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPackaged.cs @@ -141,29 +141,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (OuterPackaging != null) yield return OuterPackaging; - if (ImmediatePackaging != null) yield return ImmediatePackaging; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (OuterPackaging != null) yield return new ElementValue("outerPackaging", OuterPackaging); - if (ImmediatePackaging != null) yield return new ElementValue("immediatePackaging", ImmediatePackaging); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -179,7 +157,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -195,7 +173,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (OuterPackaging is not null) yield return new KeyValuePair("outerPackaging",OuterPackaging); @@ -465,49 +443,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - foreach (var elem in Material) { if (elem != null) yield return elem; } - foreach (var elem in AlternateMaterial) { if (elem != null) yield return elem; } - foreach (var elem in Device) { if (elem != null) yield return elem; } - foreach (var elem in ManufacturedItem) { if (elem != null) yield return elem; } - foreach (var elem in PackageItem) { if (elem != null) yield return elem; } - if (PhysicalCharacteristics != null) yield return PhysicalCharacteristics; - foreach (var elem in OtherCharacteristics) { if (elem != null) yield return elem; } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return elem; } - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Material) { if (elem != null) yield return new ElementValue("material", elem); } - foreach (var elem in AlternateMaterial) { if (elem != null) yield return new ElementValue("alternateMaterial", elem); } - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - foreach (var elem in ManufacturedItem) { if (elem != null) yield return new ElementValue("manufacturedItem", elem); } - foreach (var elem in PackageItem) { if (elem != null) yield return new ElementValue("packageItem", elem); } - if (PhysicalCharacteristics != null) yield return new ElementValue("physicalCharacteristics", PhysicalCharacteristics); - foreach (var elem in OtherCharacteristics) { if (elem != null) yield return new ElementValue("otherCharacteristics", elem); } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return new ElementValue("shelfLifeStorage", elem); } - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -553,7 +489,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -599,7 +535,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -833,43 +769,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (LegalStatusOfSupply != null) yield return LegalStatusOfSupply; - foreach (var elem in MarketingStatus) { if (elem != null) yield return elem; } - if (MarketingAuthorization != null) yield return MarketingAuthorization; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in BatchIdentifier) { if (elem != null) yield return elem; } - foreach (var elem in PackageItem) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (LegalStatusOfSupply != null) yield return new ElementValue("legalStatusOfSupply", LegalStatusOfSupply); - foreach (var elem in MarketingStatus) { if (elem != null) yield return new ElementValue("marketingStatus", elem); } - if (MarketingAuthorization != null) yield return new ElementValue("marketingAuthorization", MarketingAuthorization); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in BatchIdentifier) { if (elem != null) yield return new ElementValue("batchIdentifier", elem); } - foreach (var elem in PackageItem) { if (elem != null) yield return new ElementValue("packageItem", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -906,7 +806,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -943,7 +843,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs index 8f78ce4a03..c177cbf558 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductPharmaceutical.cs @@ -141,29 +141,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Status != null) yield return Status; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Status != null) yield return new ElementValue("status", Status); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -179,7 +157,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -195,7 +173,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -370,39 +348,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (FirstDose != null) yield return FirstDose; - if (MaxSingleDose != null) yield return MaxSingleDose; - if (MaxDosePerDay != null) yield return MaxDosePerDay; - if (MaxDosePerTreatmentPeriod != null) yield return MaxDosePerTreatmentPeriod; - if (MaxTreatmentPeriod != null) yield return MaxTreatmentPeriod; - foreach (var elem in TargetSpecies) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (FirstDose != null) yield return new ElementValue("firstDose", FirstDose); - if (MaxSingleDose != null) yield return new ElementValue("maxSingleDose", MaxSingleDose); - if (MaxDosePerDay != null) yield return new ElementValue("maxDosePerDay", MaxDosePerDay); - if (MaxDosePerTreatmentPeriod != null) yield return new ElementValue("maxDosePerTreatmentPeriod", MaxDosePerTreatmentPeriod); - if (MaxTreatmentPeriod != null) yield return new ElementValue("maxTreatmentPeriod", MaxTreatmentPeriod); - foreach (var elem in TargetSpecies) { if (elem != null) yield return new ElementValue("targetSpecies", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -433,7 +379,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -464,7 +410,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -564,29 +510,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in WithdrawalPeriod) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in WithdrawalPeriod) { if (elem != null) yield return new ElementValue("withdrawalPeriod", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -602,7 +526,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -618,7 +542,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -747,31 +671,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Tissue != null) yield return Tissue; - if (Value != null) yield return Value; - if (SupportingInformationElement != null) yield return SupportingInformationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Tissue != null) yield return new ElementValue("tissue", Tissue); - if (Value != null) yield return new ElementValue("value", Value); - if (SupportingInformationElement != null) yield return new ElementValue("supportingInformation", SupportingInformationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -790,7 +690,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -809,7 +709,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Tissue is not null) yield return new KeyValuePair("tissue",Tissue); @@ -982,39 +882,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (AdministrableDoseForm != null) yield return AdministrableDoseForm; - if (UnitOfPresentation != null) yield return UnitOfPresentation; - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - foreach (var elem in Device) { if (elem != null) yield return elem; } - foreach (var elem in Characteristics) { if (elem != null) yield return elem; } - foreach (var elem in RouteOfAdministration) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (AdministrableDoseForm != null) yield return new ElementValue("administrableDoseForm", AdministrableDoseForm); - if (UnitOfPresentation != null) yield return new ElementValue("unitOfPresentation", UnitOfPresentation); - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - foreach (var elem in Characteristics) { if (elem != null) yield return new ElementValue("characteristics", elem); } - foreach (var elem in RouteOfAdministration) { if (elem != null) yield return new ElementValue("routeOfAdministration", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1045,7 +913,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1076,7 +944,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs index a66824fda2..92d33c9f20 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MedicinalProductUndesirableEffect.cs @@ -182,35 +182,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (SymptomConditionEffect != null) yield return SymptomConditionEffect; - if (Classification != null) yield return Classification; - if (FrequencyOfOccurrence != null) yield return FrequencyOfOccurrence; - foreach (var elem in Population) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (SymptomConditionEffect != null) yield return new ElementValue("symptomConditionEffect", SymptomConditionEffect); - if (Classification != null) yield return new ElementValue("classification", Classification); - if (FrequencyOfOccurrence != null) yield return new ElementValue("frequencyOfOccurrence", FrequencyOfOccurrence); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -235,7 +207,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -260,7 +232,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Subject?.Any() == true) yield return new KeyValuePair("subject",Subject); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs index 19db4dcd29..beb0fa10a8 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MessageDefinition.cs @@ -283,33 +283,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (ProfileElement != null) yield return ProfileElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -331,7 +305,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -353,7 +327,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -489,29 +463,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MessageElement != null) yield return MessageElement; - if (SituationElement != null) yield return SituationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (SituationElement != null) yield return new ElementValue("situation", SituationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -527,7 +479,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -543,7 +495,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MessageElement is not null) yield return new KeyValuePair("message",MessageElement); @@ -1308,73 +1260,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in ReplacesElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (BaseElement != null) yield return BaseElement; - foreach (var elem in ParentElement) { if (elem != null) yield return elem; } - if (Event != null) yield return Event; - if (CategoryElement != null) yield return CategoryElement; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (ResponseRequiredElement != null) yield return ResponseRequiredElement; - foreach (var elem in AllowedResponse) { if (elem != null) yield return elem; } - foreach (var elem in GraphElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in ReplacesElement) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - foreach (var elem in ParentElement) { if (elem != null) yield return new ElementValue("parent", elem); } - if (Event != null) yield return new ElementValue("event", Event); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (ResponseRequiredElement != null) yield return new ElementValue("responseRequired", ResponseRequiredElement); - foreach (var elem in AllowedResponse) { if (elem != null) yield return new ElementValue("allowedResponse", elem); } - foreach (var elem in GraphElement) { if (elem != null) yield return new ElementValue("graph", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1456,7 +1342,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1538,7 +1424,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs index 7451ba1f97..2a8eff7411 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MessageHeader.cs @@ -248,33 +248,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Target != null) yield return Target; - if (EndpointElement != null) yield return EndpointElement; - if (Receiver != null) yield return Receiver; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Target != null) yield return new ElementValue("target", Target); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - if (Receiver != null) yield return new ElementValue("receiver", Receiver); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -296,7 +270,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -318,7 +292,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -537,35 +511,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (SoftwareElement != null) yield return SoftwareElement; - if (VersionElement != null) yield return VersionElement; - if (Contact != null) yield return Contact; - if (EndpointElement != null) yield return EndpointElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (SoftwareElement != null) yield return new ElementValue("software", SoftwareElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (Contact != null) yield return new ElementValue("contact", Contact); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -590,7 +536,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -615,7 +561,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -772,31 +718,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentifierElement != null) yield return IdentifierElement; - if (CodeElement != null) yield return CodeElement; - if (Details != null) yield return Details; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentifierElement != null) yield return new ElementValue("identifier", IdentifierElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Details != null) yield return new ElementValue("details", Details); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -815,7 +737,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -834,7 +756,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentifierElement is not null) yield return new KeyValuePair("identifier",IdentifierElement); @@ -1095,47 +1017,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Event != null) yield return Event; - foreach (var elem in Destination) { if (elem != null) yield return elem; } - if (Sender != null) yield return Sender; - if (Enterer != null) yield return Enterer; - if (Author != null) yield return Author; - if (Source != null) yield return Source; - if (Responsible != null) yield return Responsible; - if (Reason != null) yield return Reason; - if (Response != null) yield return Response; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (DefinitionElement != null) yield return DefinitionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Event != null) yield return new ElementValue("event", Event); - foreach (var elem in Destination) { if (elem != null) yield return new ElementValue("destination", elem); } - if (Sender != null) yield return new ElementValue("sender", Sender); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Author != null) yield return new ElementValue("author", Author); - if (Source != null) yield return new ElementValue("source", Source); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Response != null) yield return new ElementValue("response", Response); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1178,7 +1060,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1221,7 +1103,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Event is not null) yield return new KeyValuePair("event",Event); diff --git a/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs index cdc3d3bb1d..ff058d1a9e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/MolecularSequence.cs @@ -514,43 +514,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Chromosome != null) yield return Chromosome; - if (GenomeBuildElement != null) yield return GenomeBuildElement; - if (OrientationElement != null) yield return OrientationElement; - if (ReferenceSeqId != null) yield return ReferenceSeqId; - if (ReferenceSeqPointer != null) yield return ReferenceSeqPointer; - if (ReferenceSeqStringElement != null) yield return ReferenceSeqStringElement; - if (StrandElement != null) yield return StrandElement; - if (WindowStartElement != null) yield return WindowStartElement; - if (WindowEndElement != null) yield return WindowEndElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Chromosome != null) yield return new ElementValue("chromosome", Chromosome); - if (GenomeBuildElement != null) yield return new ElementValue("genomeBuild", GenomeBuildElement); - if (OrientationElement != null) yield return new ElementValue("orientation", OrientationElement); - if (ReferenceSeqId != null) yield return new ElementValue("referenceSeqId", ReferenceSeqId); - if (ReferenceSeqPointer != null) yield return new ElementValue("referenceSeqPointer", ReferenceSeqPointer); - if (ReferenceSeqStringElement != null) yield return new ElementValue("referenceSeqString", ReferenceSeqStringElement); - if (StrandElement != null) yield return new ElementValue("strand", StrandElement); - if (WindowStartElement != null) yield return new ElementValue("windowStart", WindowStartElement); - if (WindowEndElement != null) yield return new ElementValue("windowEnd", WindowEndElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -587,7 +551,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -624,7 +588,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Chromosome is not null) yield return new KeyValuePair("chromosome",Chromosome); @@ -883,37 +847,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (ObservedAlleleElement != null) yield return ObservedAlleleElement; - if (ReferenceAlleleElement != null) yield return ReferenceAlleleElement; - if (CigarElement != null) yield return CigarElement; - if (VariantPointer != null) yield return VariantPointer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (ObservedAlleleElement != null) yield return new ElementValue("observedAllele", ObservedAlleleElement); - if (ReferenceAlleleElement != null) yield return new ElementValue("referenceAllele", ReferenceAlleleElement); - if (CigarElement != null) yield return new ElementValue("cigar", CigarElement); - if (VariantPointer != null) yield return new ElementValue("variantPointer", VariantPointer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -941,7 +875,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -969,7 +903,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StartElement is not null) yield return new KeyValuePair("start",StartElement); @@ -1480,55 +1414,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (StandardSequence != null) yield return StandardSequence; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (Score != null) yield return Score; - if (Method != null) yield return Method; - if (TruthTPElement != null) yield return TruthTPElement; - if (QueryTPElement != null) yield return QueryTPElement; - if (TruthFNElement != null) yield return TruthFNElement; - if (QueryFPElement != null) yield return QueryFPElement; - if (GtFPElement != null) yield return GtFPElement; - if (PrecisionElement != null) yield return PrecisionElement; - if (RecallElement != null) yield return RecallElement; - if (FScoreElement != null) yield return FScoreElement; - if (Roc != null) yield return Roc; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (StandardSequence != null) yield return new ElementValue("standardSequence", StandardSequence); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (Score != null) yield return new ElementValue("score", Score); - if (Method != null) yield return new ElementValue("method", Method); - if (TruthTPElement != null) yield return new ElementValue("truthTP", TruthTPElement); - if (QueryTPElement != null) yield return new ElementValue("queryTP", QueryTPElement); - if (TruthFNElement != null) yield return new ElementValue("truthFN", TruthFNElement); - if (QueryFPElement != null) yield return new ElementValue("queryFP", QueryFPElement); - if (GtFPElement != null) yield return new ElementValue("gtFP", GtFPElement); - if (PrecisionElement != null) yield return new ElementValue("precision", PrecisionElement); - if (RecallElement != null) yield return new ElementValue("recall", RecallElement); - if (FScoreElement != null) yield return new ElementValue("fScore", FScoreElement); - if (Roc != null) yield return new ElementValue("roc", Roc); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1583,7 +1469,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1638,7 +1524,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1960,39 +1846,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ScoreElement) { if (elem != null) yield return elem; } - foreach (var elem in NumTPElement) { if (elem != null) yield return elem; } - foreach (var elem in NumFPElement) { if (elem != null) yield return elem; } - foreach (var elem in NumFNElement) { if (elem != null) yield return elem; } - foreach (var elem in PrecisionElement) { if (elem != null) yield return elem; } - foreach (var elem in SensitivityElement) { if (elem != null) yield return elem; } - foreach (var elem in FMeasureElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ScoreElement) { if (elem != null) yield return new ElementValue("score", elem); } - foreach (var elem in NumTPElement) { if (elem != null) yield return new ElementValue("numTP", elem); } - foreach (var elem in NumFPElement) { if (elem != null) yield return new ElementValue("numFP", elem); } - foreach (var elem in NumFNElement) { if (elem != null) yield return new ElementValue("numFN", elem); } - foreach (var elem in PrecisionElement) { if (elem != null) yield return new ElementValue("precision", elem); } - foreach (var elem in SensitivityElement) { if (elem != null) yield return new ElementValue("sensitivity", elem); } - foreach (var elem in FMeasureElement) { if (elem != null) yield return new ElementValue("fMeasure", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2023,7 +1877,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2054,7 +1908,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ScoreElement?.Any() == true) yield return new KeyValuePair("score",ScoreElement); @@ -2330,37 +2184,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (UrlElement != null) yield return UrlElement; - if (NameElement != null) yield return NameElement; - if (DatasetIdElement != null) yield return DatasetIdElement; - if (VariantsetIdElement != null) yield return VariantsetIdElement; - if (ReadsetIdElement != null) yield return ReadsetIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DatasetIdElement != null) yield return new ElementValue("datasetId", DatasetIdElement); - if (VariantsetIdElement != null) yield return new ElementValue("variantsetId", VariantsetIdElement); - if (ReadsetIdElement != null) yield return new ElementValue("readsetId", ReadsetIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2388,7 +2212,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2416,7 +2240,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2601,35 +2425,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VariantType != null) yield return VariantType; - if (ExactElement != null) yield return ExactElement; - if (LengthElement != null) yield return LengthElement; - if (Outer != null) yield return Outer; - if (Inner != null) yield return Inner; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VariantType != null) yield return new ElementValue("variantType", VariantType); - if (ExactElement != null) yield return new ElementValue("exact", ExactElement); - if (LengthElement != null) yield return new ElementValue("length", LengthElement); - if (Outer != null) yield return new ElementValue("outer", Outer); - if (Inner != null) yield return new ElementValue("inner", Inner); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2654,7 +2450,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2679,7 +2475,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VariantType is not null) yield return new KeyValuePair("variantType",VariantType); @@ -2811,29 +2607,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2849,7 +2623,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2865,7 +2639,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StartElement is not null) yield return new KeyValuePair("start",StartElement); @@ -2994,29 +2768,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3032,7 +2784,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3048,7 +2800,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StartElement is not null) yield return new KeyValuePair("start",StartElement); @@ -3445,57 +3197,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (CoordinateSystemElement != null) yield return CoordinateSystemElement; - if (Patient != null) yield return Patient; - if (Specimen != null) yield return Specimen; - if (Device != null) yield return Device; - if (Performer != null) yield return Performer; - if (Quantity != null) yield return Quantity; - if (ReferenceSeq != null) yield return ReferenceSeq; - foreach (var elem in Variant) { if (elem != null) yield return elem; } - if (ObservedSeqElement != null) yield return ObservedSeqElement; - foreach (var elem in Quality) { if (elem != null) yield return elem; } - if (ReadCoverageElement != null) yield return ReadCoverageElement; - foreach (var elem in Repository) { if (elem != null) yield return elem; } - foreach (var elem in Pointer) { if (elem != null) yield return elem; } - foreach (var elem in StructureVariant) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (CoordinateSystemElement != null) yield return new ElementValue("coordinateSystem", CoordinateSystemElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Specimen != null) yield return new ElementValue("specimen", Specimen); - if (Device != null) yield return new ElementValue("device", Device); - if (Performer != null) yield return new ElementValue("performer", Performer); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (ReferenceSeq != null) yield return new ElementValue("referenceSeq", ReferenceSeq); - foreach (var elem in Variant) { if (elem != null) yield return new ElementValue("variant", elem); } - if (ObservedSeqElement != null) yield return new ElementValue("observedSeq", ObservedSeqElement); - foreach (var elem in Quality) { if (elem != null) yield return new ElementValue("quality", elem); } - if (ReadCoverageElement != null) yield return new ElementValue("readCoverage", ReadCoverageElement); - foreach (var elem in Repository) { if (elem != null) yield return new ElementValue("repository", elem); } - foreach (var elem in Pointer) { if (elem != null) yield return new ElementValue("pointer", elem); } - foreach (var elem in StructureVariant) { if (elem != null) yield return new ElementValue("structureVariant", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3553,7 +3255,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3611,7 +3313,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Money.cs b/src/Hl7.Fhir.R4/Model/Generated/Money.cs index bdcc95f883..ad5bdb04f7 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Money.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Money.cs @@ -1267,29 +1267,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ValueElement != null) yield return ValueElement; - if (CurrencyElement != null) yield return CurrencyElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (CurrencyElement != null) yield return new ElementValue("currency", CurrencyElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1305,7 +1283,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1321,7 +1299,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ValueElement is not null) yield return new KeyValuePair("value",ValueElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs index a150932f34..3564442dfc 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/NamingSystem.cs @@ -333,35 +333,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ValueElement != null) yield return ValueElement; - if (PreferredElement != null) yield return PreferredElement; - if (CommentElement != null) yield return CommentElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -386,7 +358,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -411,7 +383,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -828,51 +800,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (KindElement != null) yield return KindElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (UsageElement != null) yield return UsageElement; - foreach (var elem in UniqueId) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - foreach (var elem in UniqueId) { if (elem != null) yield return new ElementValue("uniqueId", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -921,7 +849,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -970,7 +898,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs index 76479e521c..57a1730130 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/NutritionOrder.cs @@ -236,37 +236,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Schedule) { if (elem != null) yield return elem; } - foreach (var elem in Nutrient) { if (elem != null) yield return elem; } - foreach (var elem in Texture) { if (elem != null) yield return elem; } - foreach (var elem in FluidConsistencyType) { if (elem != null) yield return elem; } - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Schedule) { if (elem != null) yield return new ElementValue("schedule", elem); } - foreach (var elem in Nutrient) { if (elem != null) yield return new ElementValue("nutrient", elem); } - foreach (var elem in Texture) { if (elem != null) yield return new ElementValue("texture", elem); } - foreach (var elem in FluidConsistencyType) { if (elem != null) yield return new ElementValue("fluidConsistencyType", elem); } - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -294,7 +264,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -322,7 +292,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -423,29 +393,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Modifier != null) yield return Modifier; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Modifier != null) yield return new ElementValue("modifier", Modifier); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -461,7 +409,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -477,7 +425,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Modifier is not null) yield return new KeyValuePair("modifier",Modifier); @@ -575,29 +523,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Modifier != null) yield return Modifier; - if (FoodType != null) yield return FoodType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Modifier != null) yield return new ElementValue("modifier", Modifier); - if (FoodType != null) yield return new ElementValue("foodType", FoodType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -613,7 +539,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -629,7 +555,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Modifier is not null) yield return new KeyValuePair("modifier",Modifier); @@ -811,35 +737,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ProductNameElement != null) yield return ProductNameElement; - foreach (var elem in Schedule) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ProductNameElement != null) yield return new ElementValue("productName", ProductNameElement); - foreach (var elem in Schedule) { if (elem != null) yield return new ElementValue("schedule", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -864,7 +762,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -889,7 +787,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1158,43 +1056,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (BaseFormulaType != null) yield return BaseFormulaType; - if (BaseFormulaProductNameElement != null) yield return BaseFormulaProductNameElement; - if (AdditiveType != null) yield return AdditiveType; - if (AdditiveProductNameElement != null) yield return AdditiveProductNameElement; - if (CaloricDensity != null) yield return CaloricDensity; - if (RouteofAdministration != null) yield return RouteofAdministration; - foreach (var elem in Administration) { if (elem != null) yield return elem; } - if (MaxVolumeToDeliver != null) yield return MaxVolumeToDeliver; - if (AdministrationInstructionElement != null) yield return AdministrationInstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (BaseFormulaType != null) yield return new ElementValue("baseFormulaType", BaseFormulaType); - if (BaseFormulaProductNameElement != null) yield return new ElementValue("baseFormulaProductName", BaseFormulaProductNameElement); - if (AdditiveType != null) yield return new ElementValue("additiveType", AdditiveType); - if (AdditiveProductNameElement != null) yield return new ElementValue("additiveProductName", AdditiveProductNameElement); - if (CaloricDensity != null) yield return new ElementValue("caloricDensity", CaloricDensity); - if (RouteofAdministration != null) yield return new ElementValue("routeofAdministration", RouteofAdministration); - foreach (var elem in Administration) { if (elem != null) yield return new ElementValue("administration", elem); } - if (MaxVolumeToDeliver != null) yield return new ElementValue("maxVolumeToDeliver", MaxVolumeToDeliver); - if (AdministrationInstructionElement != null) yield return new ElementValue("administrationInstruction", AdministrationInstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1231,7 +1093,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1268,7 +1130,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (BaseFormulaType is not null) yield return new KeyValuePair("baseFormulaType",BaseFormulaType); @@ -1390,31 +1252,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Schedule != null) yield return Schedule; - if (Quantity != null) yield return Quantity; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1433,7 +1271,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1452,7 +1290,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Schedule is not null) yield return new KeyValuePair("schedule",Schedule); @@ -1910,59 +1748,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (DateTimeElement != null) yield return DateTimeElement; - if (Orderer != null) yield return Orderer; - foreach (var elem in AllergyIntolerance) { if (elem != null) yield return elem; } - foreach (var elem in FoodPreferenceModifier) { if (elem != null) yield return elem; } - foreach (var elem in ExcludeFoodModifier) { if (elem != null) yield return elem; } - if (OralDiet != null) yield return OralDiet; - foreach (var elem in Supplement) { if (elem != null) yield return elem; } - if (EnteralFormula != null) yield return EnteralFormula; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return new ElementValue("instantiates", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateTimeElement != null) yield return new ElementValue("dateTime", DateTimeElement); - if (Orderer != null) yield return new ElementValue("orderer", Orderer); - foreach (var elem in AllergyIntolerance) { if (elem != null) yield return new ElementValue("allergyIntolerance", elem); } - foreach (var elem in FoodPreferenceModifier) { if (elem != null) yield return new ElementValue("foodPreferenceModifier", elem); } - foreach (var elem in ExcludeFoodModifier) { if (elem != null) yield return new ElementValue("excludeFoodModifier", elem); } - if (OralDiet != null) yield return new ElementValue("oralDiet", OralDiet); - foreach (var elem in Supplement) { if (elem != null) yield return new ElementValue("supplement", elem); } - if (EnteralFormula != null) yield return new ElementValue("enteralFormula", EnteralFormula); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2023,7 +1809,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2084,7 +1870,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Observation.cs b/src/Hl7.Fhir.R4/Model/Generated/Observation.cs index 05ece6b0f5..ef45807d64 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Observation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Observation.cs @@ -233,37 +233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Low != null) yield return Low; - if (High != null) yield return High; - if (Type != null) yield return Type; - foreach (var elem in AppliesTo) { if (elem != null) yield return elem; } - if (Age != null) yield return Age; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Low != null) yield return new ElementValue("low", Low); - if (High != null) yield return new ElementValue("high", High); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in AppliesTo) { if (elem != null) yield return new ElementValue("appliesTo", elem); } - if (Age != null) yield return new ElementValue("age", Age); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -291,7 +261,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -319,7 +289,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Low is not null) yield return new KeyValuePair("low",Low); @@ -476,35 +446,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (DataAbsentReason != null) yield return DataAbsentReason; - foreach (var elem in Interpretation) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceRange) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - foreach (var elem in Interpretation) { if (elem != null) yield return new ElementValue("interpretation", elem); } - foreach (var elem in ReferenceRange) { if (elem != null) yield return new ElementValue("referenceRange", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -529,7 +471,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -554,7 +496,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1076,73 +1018,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Value != null) yield return Value; - if (DataAbsentReason != null) yield return DataAbsentReason; - foreach (var elem in Interpretation) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (Method != null) yield return Method; - if (Specimen != null) yield return Specimen; - if (Device != null) yield return Device; - foreach (var elem in ReferenceRange) { if (elem != null) yield return elem; } - foreach (var elem in HasMember) { if (elem != null) yield return elem; } - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Value != null) yield return new ElementValue("value", Value); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - foreach (var elem in Interpretation) { if (elem != null) yield return new ElementValue("interpretation", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Method != null) yield return new ElementValue("method", Method); - if (Specimen != null) yield return new ElementValue("specimen", Specimen); - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in ReferenceRange) { if (elem != null) yield return new ElementValue("referenceRange", elem); } - foreach (var elem in HasMember) { if (elem != null) yield return new ElementValue("hasMember", elem); } - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1224,7 +1100,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1306,7 +1182,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs index d75cc7fee3..851e55a7bd 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ObservationDefinition.cs @@ -321,33 +321,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CustomaryUnit != null) yield return CustomaryUnit; - if (Unit != null) yield return Unit; - if (ConversionFactorElement != null) yield return ConversionFactorElement; - if (DecimalPrecisionElement != null) yield return DecimalPrecisionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CustomaryUnit != null) yield return new ElementValue("customaryUnit", CustomaryUnit); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (ConversionFactorElement != null) yield return new ElementValue("conversionFactor", ConversionFactorElement); - if (DecimalPrecisionElement != null) yield return new ElementValue("decimalPrecision", DecimalPrecisionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +343,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -391,7 +365,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CustomaryUnit is not null) yield return new KeyValuePair("customaryUnit",CustomaryUnit); @@ -646,41 +620,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CategoryElement != null) yield return CategoryElement; - if (Range != null) yield return Range; - if (Context != null) yield return Context; - foreach (var elem in AppliesTo) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (Age != null) yield return Age; - if (GestationalAge != null) yield return GestationalAge; - if (ConditionElement != null) yield return ConditionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - if (Range != null) yield return new ElementValue("range", Range); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in AppliesTo) { if (elem != null) yield return new ElementValue("appliesTo", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (Age != null) yield return new ElementValue("age", Age); - if (GestationalAge != null) yield return new ElementValue("gestationalAge", GestationalAge); - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -714,7 +654,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -748,7 +688,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CategoryElement is not null) yield return new KeyValuePair("category",CategoryElement); @@ -1087,51 +1027,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in PermittedDataTypeElement) { if (elem != null) yield return elem; } - if (MultipleResultsAllowedElement != null) yield return MultipleResultsAllowedElement; - if (Method != null) yield return Method; - if (PreferredReportNameElement != null) yield return PreferredReportNameElement; - if (QuantitativeDetails != null) yield return QuantitativeDetails; - foreach (var elem in QualifiedInterval) { if (elem != null) yield return elem; } - if (ValidCodedValueSet != null) yield return ValidCodedValueSet; - if (NormalCodedValueSet != null) yield return NormalCodedValueSet; - if (AbnormalCodedValueSet != null) yield return AbnormalCodedValueSet; - if (CriticalCodedValueSet != null) yield return CriticalCodedValueSet; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in PermittedDataTypeElement) { if (elem != null) yield return new ElementValue("permittedDataType", elem); } - if (MultipleResultsAllowedElement != null) yield return new ElementValue("multipleResultsAllowed", MultipleResultsAllowedElement); - if (Method != null) yield return new ElementValue("method", Method); - if (PreferredReportNameElement != null) yield return new ElementValue("preferredReportName", PreferredReportNameElement); - if (QuantitativeDetails != null) yield return new ElementValue("quantitativeDetails", QuantitativeDetails); - foreach (var elem in QualifiedInterval) { if (elem != null) yield return new ElementValue("qualifiedInterval", elem); } - if (ValidCodedValueSet != null) yield return new ElementValue("validCodedValueSet", ValidCodedValueSet); - if (NormalCodedValueSet != null) yield return new ElementValue("normalCodedValueSet", NormalCodedValueSet); - if (AbnormalCodedValueSet != null) yield return new ElementValue("abnormalCodedValueSet", AbnormalCodedValueSet); - if (CriticalCodedValueSet != null) yield return new ElementValue("criticalCodedValueSet", CriticalCodedValueSet); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1180,7 +1076,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1229,7 +1125,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category?.Any() == true) yield return new KeyValuePair("category",Category); diff --git a/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs index ea0e94b3ef..4077b132a9 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/OperationDefinition.cs @@ -470,47 +470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (UseElement != null) yield return UseElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in TargetProfileElement) { if (elem != null) yield return elem; } - if (SearchTypeElement != null) yield return SearchTypeElement; - if (Binding != null) yield return Binding; - foreach (var elem in ReferencedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Part) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in TargetProfileElement) { if (elem != null) yield return new ElementValue("targetProfile", elem); } - if (SearchTypeElement != null) yield return new ElementValue("searchType", SearchTypeElement); - if (Binding != null) yield return new ElementValue("binding", Binding); - foreach (var elem in ReferencedFrom) { if (elem != null) yield return new ElementValue("referencedFrom", elem); } - foreach (var elem in Part) { if (elem != null) yield return new ElementValue("part", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -553,7 +513,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -596,7 +556,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -741,29 +701,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StrengthElement != null) yield return StrengthElement; - if (ValueSetElement != null) yield return ValueSetElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StrengthElement != null) yield return new ElementValue("strength", StrengthElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -779,7 +717,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -795,7 +733,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StrengthElement is not null) yield return new KeyValuePair("strength",StrengthElement); @@ -929,29 +867,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceElement != null) yield return SourceElement; - if (SourceIdElement != null) yield return SourceIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -967,7 +883,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -983,7 +899,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceElement is not null) yield return new KeyValuePair("source",SourceElement); @@ -1117,29 +1033,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ParameterNameElement) { if (elem != null) yield return elem; } - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ParameterNameElement) { if (elem != null) yield return new ElementValue("parameterName", elem); } - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1155,7 +1049,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1171,7 +1065,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ParameterNameElement?.Any() == true) yield return new KeyValuePair("parameterName",ParameterNameElement); @@ -2036,77 +1930,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (KindElement != null) yield return KindElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (AffectsStateElement != null) yield return AffectsStateElement; - if (CodeElement != null) yield return CodeElement; - if (CommentElement != null) yield return CommentElement; - if (BaseElement != null) yield return BaseElement; - foreach (var elem in ResourceElement) { if (elem != null) yield return elem; } - if (SystemElement != null) yield return SystemElement; - if (TypeElement != null) yield return TypeElement; - if (InstanceElement != null) yield return InstanceElement; - if (InputProfileElement != null) yield return InputProfileElement; - if (OutputProfileElement != null) yield return OutputProfileElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in Overload) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (AffectsStateElement != null) yield return new ElementValue("affectsState", AffectsStateElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - foreach (var elem in ResourceElement) { if (elem != null) yield return new ElementValue("resource", elem); } - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (InstanceElement != null) yield return new ElementValue("instance", InstanceElement); - if (InputProfileElement != null) yield return new ElementValue("inputProfile", InputProfileElement); - if (OutputProfileElement != null) yield return new ElementValue("outputProfile", OutputProfileElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in Overload) { if (elem != null) yield return new ElementValue("overload", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2194,7 +2018,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2282,7 +2106,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Organization.cs b/src/Hl7.Fhir.R4/Model/Generated/Organization.cs index c586a1263e..64499d378e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Organization.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Organization.cs @@ -180,33 +180,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Purpose != null) yield return Purpose; - if (Name != null) yield return Name; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Purpose != null) yield return new ElementValue("purpose", Purpose); - if (Name != null) yield return new ElementValue("name", Name); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -228,7 +202,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -250,7 +224,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Purpose is not null) yield return new KeyValuePair("purpose",Purpose); @@ -528,45 +502,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (PartOf != null) yield return PartOf; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -606,7 +542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -646,7 +582,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs b/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs index 09a1326ab2..faeaa29953 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/OrganizationAffiliation.cs @@ -329,49 +329,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Period != null) yield return Period; - if (Organization != null) yield return Organization; - if (ParticipatingOrganization != null) yield return ParticipatingOrganization; - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - foreach (var elem in HealthcareService) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (ParticipatingOrganization != null) yield return new ElementValue("participatingOrganization", ParticipatingOrganization); - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in HealthcareService) { if (elem != null) yield return new ElementValue("healthcareService", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -417,7 +375,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -463,7 +421,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ParameterDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ParameterDefinition.cs index 78b4a2951e..1467fc2a06 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ParameterDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ParameterDefinition.cs @@ -342,39 +342,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (UseElement != null) yield return UseElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (TypeElement != null) yield return TypeElement; - if (ProfileElement != null) yield return ProfileElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -405,7 +373,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -436,7 +404,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Patient.cs b/src/Hl7.Fhir.R4/Model/Generated/Patient.cs index 0782340222..76c516378c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Patient.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Patient.cs @@ -285,39 +285,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - if (Name != null) yield return Name; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - if (GenderElement != null) yield return GenderElement; - if (Organization != null) yield return Organization; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - if (Name != null) yield return new ElementValue("name", Name); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -348,7 +316,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -379,7 +347,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Relationship?.Any() == true) yield return new KeyValuePair("relationship",Relationship); @@ -500,29 +468,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (PreferredElement != null) yield return PreferredElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -538,7 +484,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -554,7 +500,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -675,29 +621,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Other != null) yield return Other; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Other != null) yield return new ElementValue("other", Other); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -713,7 +637,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -729,7 +653,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Other is not null) yield return new KeyValuePair("other",Other); @@ -1111,57 +1035,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (MaritalStatus != null) yield return MaritalStatus; - if (MultipleBirth != null) yield return MultipleBirth; - foreach (var elem in Photo) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - foreach (var elem in GeneralPractitioner) { if (elem != null) yield return elem; } - if (ManagingOrganization != null) yield return ManagingOrganization; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (MaritalStatus != null) yield return new ElementValue("maritalStatus", MaritalStatus); - if (MultipleBirth != null) yield return new ElementValue("multipleBirth", MultipleBirth); - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - foreach (var elem in GeneralPractitioner) { if (elem != null) yield return new ElementValue("generalPractitioner", elem); } - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1219,7 +1093,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1277,7 +1151,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs index 783b970eff..f77bf2fc39 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/PaymentNotice.cs @@ -367,49 +367,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - if (CreatedElement != null) yield return CreatedElement; - if (Provider != null) yield return Provider; - if (Payment != null) yield return Payment; - if (PaymentDateElement != null) yield return PaymentDateElement; - if (Payee != null) yield return Payee; - if (Recipient != null) yield return Recipient; - if (Amount != null) yield return Amount; - if (PaymentStatus != null) yield return PaymentStatus; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Payment != null) yield return new ElementValue("payment", Payment); - if (PaymentDateElement != null) yield return new ElementValue("paymentDate", PaymentDateElement); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Recipient != null) yield return new ElementValue("recipient", Recipient); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (PaymentStatus != null) yield return new ElementValue("paymentStatus", PaymentStatus); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -455,7 +413,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -501,7 +459,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs index e90062ee63..dd93d9dca4 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/PaymentReconciliation.cs @@ -304,45 +304,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Predecessor != null) yield return Predecessor; - if (Type != null) yield return Type; - if (Request != null) yield return Request; - if (Submitter != null) yield return Submitter; - if (Response != null) yield return Response; - if (DateElement != null) yield return DateElement; - if (Responsible != null) yield return Responsible; - if (Payee != null) yield return Payee; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Predecessor != null) yield return new ElementValue("predecessor", Predecessor); - if (Type != null) yield return new ElementValue("type", Type); - if (Request != null) yield return new ElementValue("request", Request); - if (Submitter != null) yield return new ElementValue("submitter", Submitter); - if (Response != null) yield return new ElementValue("response", Response); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -382,7 +344,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -422,7 +384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -564,29 +526,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -602,7 +542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -618,7 +558,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1016,55 +956,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - if (CreatedElement != null) yield return CreatedElement; - if (PaymentIssuer != null) yield return PaymentIssuer; - if (Request != null) yield return Request; - if (Requestor != null) yield return Requestor; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (PaymentDateElement != null) yield return PaymentDateElement; - if (PaymentAmount != null) yield return PaymentAmount; - if (PaymentIdentifier != null) yield return PaymentIdentifier; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - if (FormCode != null) yield return FormCode; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (PaymentIssuer != null) yield return new ElementValue("paymentIssuer", PaymentIssuer); - if (Request != null) yield return new ElementValue("request", Request); - if (Requestor != null) yield return new ElementValue("requestor", Requestor); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (PaymentDateElement != null) yield return new ElementValue("paymentDate", PaymentDateElement); - if (PaymentAmount != null) yield return new ElementValue("paymentAmount", PaymentAmount); - if (PaymentIdentifier != null) yield return new ElementValue("paymentIdentifier", PaymentIdentifier); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - if (FormCode != null) yield return new ElementValue("formCode", FormCode); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1119,7 +1011,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1174,7 +1066,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Person.cs b/src/Hl7.Fhir.R4/Model/Generated/Person.cs index 5a0c081272..12035165e8 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Person.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Person.cs @@ -201,29 +201,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Target != null) yield return Target; - if (AssuranceElement != null) yield return AssuranceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Target != null) yield return new ElementValue("target", Target); - if (AssuranceElement != null) yield return new ElementValue("assurance", AssuranceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -239,7 +217,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -255,7 +233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target is not null) yield return new KeyValuePair("target",Target); @@ -528,45 +506,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (Photo != null) yield return Photo; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (Photo != null) yield return new ElementValue("photo", Photo); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -606,7 +546,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -646,7 +586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs index b5cb65a618..da1ba762f9 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/PlanDefinition.cs @@ -235,39 +235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Description != null) yield return Description; - if (Priority != null) yield return Priority; - if (Start != null) yield return Start; - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Description != null) yield return new ElementValue("description", Description); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Start != null) yield return new ElementValue("start", Start); - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -298,7 +266,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -329,7 +297,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -449,31 +417,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Measure != null) yield return Measure; - if (Detail != null) yield return Detail; - if (Due != null) yield return Due; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Measure != null) yield return new ElementValue("measure", Measure); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (Due != null) yield return new ElementValue("due", Due); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -492,7 +436,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -511,7 +455,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Measure is not null) yield return new KeyValuePair("measure",Measure); @@ -1258,79 +1202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PrefixElement != null) yield return PrefixElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TextEquivalentElement != null) yield return TextEquivalentElement; - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in GoalIdElement) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in Trigger) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - foreach (var elem in RelatedAction) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (GroupingBehaviorElement != null) yield return GroupingBehaviorElement; - if (SelectionBehaviorElement != null) yield return SelectionBehaviorElement; - if (RequiredBehaviorElement != null) yield return RequiredBehaviorElement; - if (PrecheckBehaviorElement != null) yield return PrecheckBehaviorElement; - if (CardinalityBehaviorElement != null) yield return CardinalityBehaviorElement; - if (Definition != null) yield return Definition; - if (TransformElement != null) yield return TransformElement; - foreach (var elem in DynamicValue) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TextEquivalentElement != null) yield return new ElementValue("textEquivalent", TextEquivalentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in GoalIdElement) { if (elem != null) yield return new ElementValue("goalId", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Trigger) { if (elem != null) yield return new ElementValue("trigger", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - foreach (var elem in RelatedAction) { if (elem != null) yield return new ElementValue("relatedAction", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (GroupingBehaviorElement != null) yield return new ElementValue("groupingBehavior", GroupingBehaviorElement); - if (SelectionBehaviorElement != null) yield return new ElementValue("selectionBehavior", SelectionBehaviorElement); - if (RequiredBehaviorElement != null) yield return new ElementValue("requiredBehavior", RequiredBehaviorElement); - if (PrecheckBehaviorElement != null) yield return new ElementValue("precheckBehavior", PrecheckBehaviorElement); - if (CardinalityBehaviorElement != null) yield return new ElementValue("cardinalityBehavior", CardinalityBehaviorElement); - if (Definition != null) yield return new ElementValue("definition", Definition); - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in DynamicValue) { if (elem != null) yield return new ElementValue("dynamicValue", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1421,7 +1293,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1512,7 +1384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PrefixElement is not null) yield return new KeyValuePair("prefix",PrefixElement); @@ -1655,29 +1527,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1693,7 +1543,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1709,7 +1559,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -1864,31 +1714,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActionIdElement != null) yield return ActionIdElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (Offset != null) yield return Offset; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActionIdElement != null) yield return new ElementValue("actionId", ActionIdElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (Offset != null) yield return new ElementValue("offset", Offset); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1907,7 +1733,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1926,7 +1752,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActionIdElement is not null) yield return new KeyValuePair("actionId",ActionIdElement); @@ -2045,29 +1871,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2083,7 +1887,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2099,7 +1903,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2214,29 +2018,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2252,7 +2034,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2268,7 +2050,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -3125,87 +2907,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (Type != null) yield return Type; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (Type != null) yield return new ElementValue("type", Type); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3308,7 +3010,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3411,7 +3113,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Population.cs b/src/Hl7.Fhir.R4/Model/Generated/Population.cs index 81e4feebc4..c3e76546a1 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Population.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Population.cs @@ -164,33 +164,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Age != null) yield return Age; - if (Gender != null) yield return Gender; - if (Race != null) yield return Race; - if (PhysiologicalCondition != null) yield return PhysiologicalCondition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Age != null) yield return new ElementValue("age", Age); - if (Gender != null) yield return new ElementValue("gender", Gender); - if (Race != null) yield return new ElementValue("race", Race); - if (PhysiologicalCondition != null) yield return new ElementValue("physiologicalCondition", PhysiologicalCondition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -212,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -234,7 +208,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Age is not null) yield return new KeyValuePair("age",Age); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs index 81bc21c532..e4764c9acb 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Practitioner.cs @@ -183,33 +183,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Period != null) yield return Period; - if (Issuer != null) yield return Issuer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Period != null) yield return new ElementValue("period", Period); - if (Issuer != null) yield return new ElementValue("issuer", Issuer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -231,7 +205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -253,7 +227,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -529,45 +503,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Photo) { if (elem != null) yield return elem; } - foreach (var elem in Qualification) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - foreach (var elem in Qualification) { if (elem != null) yield return new ElementValue("qualification", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -607,7 +543,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -647,7 +583,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs index c57f9b551f..09cc5275de 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/PractitionerRole.cs @@ -254,33 +254,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return elem; } - if (AllDayElement != null) yield return AllDayElement; - if (AvailableStartTimeElement != null) yield return AvailableStartTimeElement; - if (AvailableEndTimeElement != null) yield return AvailableEndTimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return new ElementValue("daysOfWeek", elem); } - if (AllDayElement != null) yield return new ElementValue("allDay", AllDayElement); - if (AvailableStartTimeElement != null) yield return new ElementValue("availableStartTime", AvailableStartTimeElement); - if (AvailableEndTimeElement != null) yield return new ElementValue("availableEndTime", AvailableEndTimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -302,7 +276,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -324,7 +298,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DaysOfWeekElement?.Any() == true) yield return new KeyValuePair("daysOfWeek",DaysOfWeekElement); @@ -441,29 +415,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (During != null) yield return During; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (During != null) yield return new ElementValue("during", During); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -479,7 +431,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -495,7 +447,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -829,53 +781,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Period != null) yield return Period; - if (Practitioner != null) yield return Practitioner; - if (Organization != null) yield return Organization; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - foreach (var elem in HealthcareService) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in AvailableTime) { if (elem != null) yield return elem; } - foreach (var elem in NotAvailable) { if (elem != null) yield return elem; } - if (AvailabilityExceptionsElement != null) yield return AvailabilityExceptionsElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Practitioner != null) yield return new ElementValue("practitioner", Practitioner); - if (Organization != null) yield return new ElementValue("organization", Organization); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in HealthcareService) { if (elem != null) yield return new ElementValue("healthcareService", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in AvailableTime) { if (elem != null) yield return new ElementValue("availableTime", elem); } - foreach (var elem in NotAvailable) { if (elem != null) yield return new ElementValue("notAvailable", elem); } - if (AvailabilityExceptionsElement != null) yield return new ElementValue("availabilityExceptions", AvailabilityExceptionsElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -927,7 +833,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -979,7 +885,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs index 5ea229a399..ae831ded54 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Procedure.cs @@ -168,31 +168,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -211,7 +187,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -230,7 +206,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -331,29 +307,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Action != null) yield return Action; - if (Manipulated != null) yield return Manipulated; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Action != null) yield return new ElementValue("action", Action); - if (Manipulated != null) yield return new ElementValue("manipulated", Manipulated); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -385,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action is not null) yield return new KeyValuePair("action",Action); @@ -994,81 +948,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Performed != null) yield return Performed; - if (Recorder != null) yield return Recorder; - if (Asserter != null) yield return Asserter; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (Outcome != null) yield return Outcome; - foreach (var elem in Report) { if (elem != null) yield return elem; } - foreach (var elem in Complication) { if (elem != null) yield return elem; } - foreach (var elem in ComplicationDetail) { if (elem != null) yield return elem; } - foreach (var elem in FollowUp) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in FocalDevice) { if (elem != null) yield return elem; } - foreach (var elem in UsedReference) { if (elem != null) yield return elem; } - foreach (var elem in UsedCode) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Performed != null) yield return new ElementValue("performed", Performed); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - if (Asserter != null) yield return new ElementValue("asserter", Asserter); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - foreach (var elem in Report) { if (elem != null) yield return new ElementValue("report", elem); } - foreach (var elem in Complication) { if (elem != null) yield return new ElementValue("complication", elem); } - foreach (var elem in ComplicationDetail) { if (elem != null) yield return new ElementValue("complicationDetail", elem); } - foreach (var elem in FollowUp) { if (elem != null) yield return new ElementValue("followUp", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in FocalDevice) { if (elem != null) yield return new ElementValue("focalDevice", elem); } - foreach (var elem in UsedReference) { if (elem != null) yield return new ElementValue("usedReference", elem); } - foreach (var elem in UsedCode) { if (elem != null) yield return new ElementValue("usedCode", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1162,7 +1042,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1256,7 +1136,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ProdCharacteristic.cs b/src/Hl7.Fhir.R4/Model/Generated/ProdCharacteristic.cs index dfd21924d5..62bfa52488 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ProdCharacteristic.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ProdCharacteristic.cs @@ -328,47 +328,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Height != null) yield return Height; - if (Width != null) yield return Width; - if (Depth != null) yield return Depth; - if (Weight != null) yield return Weight; - if (NominalVolume != null) yield return NominalVolume; - if (ExternalDiameter != null) yield return ExternalDiameter; - if (ShapeElement != null) yield return ShapeElement; - foreach (var elem in ColorElement) { if (elem != null) yield return elem; } - foreach (var elem in ImprintElement) { if (elem != null) yield return elem; } - foreach (var elem in Image) { if (elem != null) yield return elem; } - if (Scoring != null) yield return Scoring; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Height != null) yield return new ElementValue("height", Height); - if (Width != null) yield return new ElementValue("width", Width); - if (Depth != null) yield return new ElementValue("depth", Depth); - if (Weight != null) yield return new ElementValue("weight", Weight); - if (NominalVolume != null) yield return new ElementValue("nominalVolume", NominalVolume); - if (ExternalDiameter != null) yield return new ElementValue("externalDiameter", ExternalDiameter); - if (ShapeElement != null) yield return new ElementValue("shape", ShapeElement); - foreach (var elem in ColorElement) { if (elem != null) yield return new ElementValue("color", elem); } - foreach (var elem in ImprintElement) { if (elem != null) yield return new ElementValue("imprint", elem); } - foreach (var elem in Image) { if (elem != null) yield return new ElementValue("image", elem); } - if (Scoring != null) yield return new ElementValue("scoring", Scoring); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -411,7 +371,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -454,7 +414,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Height is not null) yield return new KeyValuePair("height",Height); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ProductShelfLife.cs b/src/Hl7.Fhir.R4/Model/Generated/ProductShelfLife.cs index 869004f77b..11349a046a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ProductShelfLife.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ProductShelfLife.cs @@ -162,33 +162,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Type != null) yield return Type; - if (Period != null) yield return Period; - foreach (var elem in SpecialPrecautionsForStorage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Type != null) yield return new ElementValue("type", Type); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in SpecialPrecautionsForStorage) { if (elem != null) yield return new ElementValue("specialPrecautionsForStorage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +184,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -232,7 +206,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs index bf066ff044..d13833f419 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Provenance.cs @@ -228,33 +228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Who != null) yield return Who; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Who != null) yield return new ElementValue("who", Who); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -276,7 +250,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -298,7 +272,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -434,31 +408,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RoleElement != null) yield return RoleElement; - if (What != null) yield return What; - foreach (var elem in Agent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RoleElement != null) yield return new ElementValue("role", RoleElement); - if (What != null) yield return new ElementValue("what", What); - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -477,7 +427,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -496,7 +446,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RoleElement is not null) yield return new KeyValuePair("role",RoleElement); @@ -756,45 +706,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Target) { if (elem != null) yield return elem; } - if (Occurred != null) yield return Occurred; - if (RecordedElement != null) yield return RecordedElement; - foreach (var elem in PolicyElement) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (Activity != null) yield return Activity; - foreach (var elem in Agent) { if (elem != null) yield return elem; } - foreach (var elem in Entity) { if (elem != null) yield return elem; } - foreach (var elem in Signature) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - if (Occurred != null) yield return new ElementValue("occurred", Occurred); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - foreach (var elem in PolicyElement) { if (elem != null) yield return new ElementValue("policy", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (Activity != null) yield return new ElementValue("activity", Activity); - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - foreach (var elem in Entity) { if (elem != null) yield return new ElementValue("entity", elem); } - foreach (var elem in Signature) { if (elem != null) yield return new ElementValue("signature", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -834,7 +746,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -874,7 +786,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target?.Any() == true) yield return new KeyValuePair("target",Target); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs index 2d05b408bb..0fb9b35a5e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Questionnaire.cs @@ -761,57 +761,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (DefinitionElement != null) yield return DefinitionElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (PrefixElement != null) yield return PrefixElement; - if (TextElement != null) yield return TextElement; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in EnableWhen) { if (elem != null) yield return elem; } - if (EnableBehaviorElement != null) yield return EnableBehaviorElement; - if (RequiredElement != null) yield return RequiredElement; - if (RepeatsElement != null) yield return RepeatsElement; - if (ReadOnlyElement != null) yield return ReadOnlyElement; - if (MaxLengthElement != null) yield return MaxLengthElement; - if (AnswerValueSetElement != null) yield return AnswerValueSetElement; - foreach (var elem in AnswerOption) { if (elem != null) yield return elem; } - foreach (var elem in Initial) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in EnableWhen) { if (elem != null) yield return new ElementValue("enableWhen", elem); } - if (EnableBehaviorElement != null) yield return new ElementValue("enableBehavior", EnableBehaviorElement); - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (RepeatsElement != null) yield return new ElementValue("repeats", RepeatsElement); - if (ReadOnlyElement != null) yield return new ElementValue("readOnly", ReadOnlyElement); - if (MaxLengthElement != null) yield return new ElementValue("maxLength", MaxLengthElement); - if (AnswerValueSetElement != null) yield return new ElementValue("answerValueSet", AnswerValueSetElement); - foreach (var elem in AnswerOption) { if (elem != null) yield return new ElementValue("answerOption", elem); } - foreach (var elem in Initial) { if (elem != null) yield return new ElementValue("initial", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -869,7 +819,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -927,7 +877,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1099,31 +1049,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (QuestionElement != null) yield return QuestionElement; - if (OperatorElement != null) yield return OperatorElement; - if (Answer != null) yield return Answer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (QuestionElement != null) yield return new ElementValue("question", QuestionElement); - if (OperatorElement != null) yield return new ElementValue("operator", OperatorElement); - if (Answer != null) yield return new ElementValue("answer", Answer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1142,7 +1068,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1161,7 +1087,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (QuestionElement is not null) yield return new KeyValuePair("question",QuestionElement); @@ -1282,29 +1208,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - if (InitialSelectedElement != null) yield return InitialSelectedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - if (InitialSelectedElement != null) yield return new ElementValue("initialSelected", InitialSelectedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1320,7 +1224,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1336,7 +1240,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -1422,27 +1326,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1455,7 +1339,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1468,7 +1352,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2157,69 +2041,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in DerivedFromElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - foreach (var elem in SubjectTypeElement) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in DerivedFromElement) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - foreach (var elem in SubjectTypeElement) { if (elem != null) yield return new ElementValue("subjectType", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2295,7 +2117,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2371,7 +2193,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs index 824284d9bd..fd286e97f3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/QuestionnaireResponse.cs @@ -293,35 +293,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (DefinitionElement != null) yield return DefinitionElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in Answer) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -346,7 +318,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -371,7 +343,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -476,29 +448,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -514,7 +464,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -530,7 +480,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -828,47 +778,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (QuestionnaireElement != null) yield return QuestionnaireElement; - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (AuthoredElement != null) yield return AuthoredElement; - if (Author != null) yield return Author; - if (Source != null) yield return Source; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (QuestionnaireElement != null) yield return new ElementValue("questionnaire", QuestionnaireElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (AuthoredElement != null) yield return new ElementValue("authored", AuthoredElement); - if (Author != null) yield return new ElementValue("author", Author); - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -911,7 +821,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -954,7 +864,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Ratio.cs b/src/Hl7.Fhir.R4/Model/Generated/Ratio.cs index 944ba772c3..5d4c29faba 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Ratio.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Ratio.cs @@ -131,29 +131,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Numerator != null) yield return Numerator; - if (Denominator != null) yield return Denominator; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Numerator != null) yield return new ElementValue("numerator", Numerator); - if (Denominator != null) yield return new ElementValue("denominator", Denominator); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -169,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -185,7 +163,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Numerator is not null) yield return new KeyValuePair("numerator",Numerator); diff --git a/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs index 71b6fec83f..8f78f00889 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/RelatedPerson.cs @@ -166,29 +166,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (PreferredElement != null) yield return PreferredElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -204,7 +182,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -220,7 +198,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -532,49 +510,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Patient != null) yield return Patient; - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Address) { if (elem != null) yield return elem; } - foreach (var elem in Photo) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in Communication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -620,7 +556,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -666,7 +602,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs index 1029fc0365..ca072cfa7e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/RequestGroup.cs @@ -623,63 +623,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PrefixElement != null) yield return PrefixElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TextEquivalentElement != null) yield return TextEquivalentElement; - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in RelatedAction) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (GroupingBehaviorElement != null) yield return GroupingBehaviorElement; - if (SelectionBehaviorElement != null) yield return SelectionBehaviorElement; - if (RequiredBehaviorElement != null) yield return RequiredBehaviorElement; - if (PrecheckBehaviorElement != null) yield return PrecheckBehaviorElement; - if (CardinalityBehaviorElement != null) yield return CardinalityBehaviorElement; - if (Resource != null) yield return Resource; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TextEquivalentElement != null) yield return new ElementValue("textEquivalent", TextEquivalentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in RelatedAction) { if (elem != null) yield return new ElementValue("relatedAction", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (GroupingBehaviorElement != null) yield return new ElementValue("groupingBehavior", GroupingBehaviorElement); - if (SelectionBehaviorElement != null) yield return new ElementValue("selectionBehavior", SelectionBehaviorElement); - if (RequiredBehaviorElement != null) yield return new ElementValue("requiredBehavior", RequiredBehaviorElement); - if (PrecheckBehaviorElement != null) yield return new ElementValue("precheckBehavior", PrecheckBehaviorElement); - if (CardinalityBehaviorElement != null) yield return new ElementValue("cardinalityBehavior", CardinalityBehaviorElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -746,7 +690,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -813,7 +757,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PrefixElement is not null) yield return new KeyValuePair("prefix",PrefixElement); @@ -948,29 +892,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -986,7 +908,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1002,7 +924,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -1156,31 +1078,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActionIdElement != null) yield return ActionIdElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (Offset != null) yield return Offset; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActionIdElement != null) yield return new ElementValue("actionId", ActionIdElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (Offset != null) yield return new ElementValue("offset", Offset); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1199,7 +1097,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1218,7 +1116,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActionIdElement is not null) yield return new KeyValuePair("actionId",ActionIdElement); @@ -1697,61 +1595,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Author != null) yield return Author; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1815,7 +1659,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1879,7 +1723,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs index 56cef94cf9..517c9d442e 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchDefinition.cs @@ -998,93 +998,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (ShortTitleElement != null) yield return ShortTitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in CommentElement) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (Population != null) yield return Population; - if (Exposure != null) yield return Exposure; - if (ExposureAlternative != null) yield return ExposureAlternative; - if (Outcome != null) yield return Outcome; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ShortTitleElement != null) yield return new ElementValue("shortTitle", ShortTitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in CommentElement) { if (elem != null) yield return new ElementValue("comment", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (Population != null) yield return new ElementValue("population", Population); - if (Exposure != null) yield return new ElementValue("exposure", Exposure); - if (ExposureAlternative != null) yield return new ElementValue("exposureAlternative", ExposureAlternative); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1196,7 +1110,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1308,7 +1222,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs index a1c52585b5..5586b24728 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchElementDefinition.cs @@ -439,49 +439,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Definition != null) yield return Definition; - foreach (var elem in UsageContext) { if (elem != null) yield return elem; } - if (ExcludeElement != null) yield return ExcludeElement; - if (UnitOfMeasure != null) yield return UnitOfMeasure; - if (StudyEffectiveDescriptionElement != null) yield return StudyEffectiveDescriptionElement; - if (StudyEffective != null) yield return StudyEffective; - if (StudyEffectiveTimeFromStart != null) yield return StudyEffectiveTimeFromStart; - if (StudyEffectiveGroupMeasureElement != null) yield return StudyEffectiveGroupMeasureElement; - if (ParticipantEffectiveDescriptionElement != null) yield return ParticipantEffectiveDescriptionElement; - if (ParticipantEffective != null) yield return ParticipantEffective; - if (ParticipantEffectiveTimeFromStart != null) yield return ParticipantEffectiveTimeFromStart; - if (ParticipantEffectiveGroupMeasureElement != null) yield return ParticipantEffectiveGroupMeasureElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Definition != null) yield return new ElementValue("definition", Definition); - foreach (var elem in UsageContext) { if (elem != null) yield return new ElementValue("usageContext", elem); } - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (UnitOfMeasure != null) yield return new ElementValue("unitOfMeasure", UnitOfMeasure); - if (StudyEffectiveDescriptionElement != null) yield return new ElementValue("studyEffectiveDescription", StudyEffectiveDescriptionElement); - if (StudyEffective != null) yield return new ElementValue("studyEffective", StudyEffective); - if (StudyEffectiveTimeFromStart != null) yield return new ElementValue("studyEffectiveTimeFromStart", StudyEffectiveTimeFromStart); - if (StudyEffectiveGroupMeasureElement != null) yield return new ElementValue("studyEffectiveGroupMeasure", StudyEffectiveGroupMeasureElement); - if (ParticipantEffectiveDescriptionElement != null) yield return new ElementValue("participantEffectiveDescription", ParticipantEffectiveDescriptionElement); - if (ParticipantEffective != null) yield return new ElementValue("participantEffective", ParticipantEffective); - if (ParticipantEffectiveTimeFromStart != null) yield return new ElementValue("participantEffectiveTimeFromStart", ParticipantEffectiveTimeFromStart); - if (ParticipantEffectiveGroupMeasureElement != null) yield return new ElementValue("participantEffectiveGroupMeasure", ParticipantEffectiveGroupMeasureElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -527,7 +485,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -573,7 +531,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Definition is not null) yield return new KeyValuePair("definition",Definition); @@ -1548,91 +1506,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (ShortTitleElement != null) yield return ShortTitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in CommentElement) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (VariableTypeElement != null) yield return VariableTypeElement; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ShortTitleElement != null) yield return new ElementValue("shortTitle", ShortTitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in CommentElement) { if (elem != null) yield return new ElementValue("comment", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (VariableTypeElement != null) yield return new ElementValue("variableType", VariableTypeElement); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1741,7 +1615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1850,7 +1724,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs index 6585f1292b..c2ee941639 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchStudy.cs @@ -276,31 +276,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -319,7 +295,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -338,7 +314,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -454,29 +430,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -492,7 +446,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -508,7 +462,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1034,73 +988,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - foreach (var elem in Protocol) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (PrimaryPurposeType != null) yield return PrimaryPurposeType; - if (Phase != null) yield return Phase; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Focus) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Keyword) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Enrollment) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Sponsor != null) yield return Sponsor; - if (PrincipalInvestigator != null) yield return PrincipalInvestigator; - foreach (var elem in Site) { if (elem != null) yield return elem; } - if (ReasonStopped != null) yield return ReasonStopped; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Arm) { if (elem != null) yield return elem; } - foreach (var elem in Objective) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in Protocol) { if (elem != null) yield return new ElementValue("protocol", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (PrimaryPurposeType != null) yield return new ElementValue("primaryPurposeType", PrimaryPurposeType); - if (Phase != null) yield return new ElementValue("phase", Phase); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Keyword) { if (elem != null) yield return new ElementValue("keyword", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Enrollment) { if (elem != null) yield return new ElementValue("enrollment", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Sponsor != null) yield return new ElementValue("sponsor", Sponsor); - if (PrincipalInvestigator != null) yield return new ElementValue("principalInvestigator", PrincipalInvestigator); - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - if (ReasonStopped != null) yield return new ElementValue("reasonStopped", ReasonStopped); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Arm) { if (elem != null) yield return new ElementValue("arm", elem); } - foreach (var elem in Objective) { if (elem != null) yield return new ElementValue("objective", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1182,7 +1070,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1264,7 +1152,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs index 564746c9c3..64e303c17a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ResearchSubject.cs @@ -383,41 +383,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - if (Study != null) yield return Study; - if (Individual != null) yield return Individual; - if (AssignedArmElement != null) yield return AssignedArmElement; - if (ActualArmElement != null) yield return ActualArmElement; - if (Consent != null) yield return Consent; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Study != null) yield return new ElementValue("study", Study); - if (Individual != null) yield return new ElementValue("individual", Individual); - if (AssignedArmElement != null) yield return new ElementValue("assignedArm", AssignedArmElement); - if (ActualArmElement != null) yield return new ElementValue("actualArm", ActualArmElement); - if (Consent != null) yield return new ElementValue("consent", Consent); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -451,7 +417,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -485,7 +451,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs index e8c81c16c5..eac3ee3984 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/RiskAssessment.cs @@ -253,37 +253,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Outcome != null) yield return Outcome; - if (Probability != null) yield return Probability; - if (QualitativeRisk != null) yield return QualitativeRisk; - if (RelativeRiskElement != null) yield return RelativeRiskElement; - if (When != null) yield return When; - if (RationaleElement != null) yield return RationaleElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (Probability != null) yield return new ElementValue("probability", Probability); - if (QualitativeRisk != null) yield return new ElementValue("qualitativeRisk", QualitativeRisk); - if (RelativeRiskElement != null) yield return new ElementValue("relativeRisk", RelativeRiskElement); - if (When != null) yield return new ElementValue("when", When); - if (RationaleElement != null) yield return new ElementValue("rationale", RationaleElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -311,7 +281,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -339,7 +309,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Outcome is not null) yield return new KeyValuePair("outcome",Outcome); @@ -733,59 +703,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (BasedOn != null) yield return BasedOn; - if (Parent != null) yield return Parent; - if (StatusElement != null) yield return StatusElement; - if (Method != null) yield return Method; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (Condition != null) yield return Condition; - if (Performer != null) yield return Performer; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Basis) { if (elem != null) yield return elem; } - foreach (var elem in Prediction) { if (elem != null) yield return elem; } - if (MitigationElement != null) yield return MitigationElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (BasedOn != null) yield return new ElementValue("basedOn", BasedOn); - if (Parent != null) yield return new ElementValue("parent", Parent); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Method != null) yield return new ElementValue("method", Method); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Basis) { if (elem != null) yield return new ElementValue("basis", elem); } - foreach (var elem in Prediction) { if (elem != null) yield return new ElementValue("prediction", elem); } - if (MitigationElement != null) yield return new ElementValue("mitigation", MitigationElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -846,7 +764,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -907,7 +825,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs b/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs index 6cd2876fe6..17d5f29292 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/RiskEvidenceSynthesis.cs @@ -216,31 +216,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (NumberOfStudiesElement != null) yield return NumberOfStudiesElement; - if (NumberOfParticipantsElement != null) yield return NumberOfParticipantsElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (NumberOfStudiesElement != null) yield return new ElementValue("numberOfStudies", NumberOfStudiesElement); - if (NumberOfParticipantsElement != null) yield return new ElementValue("numberOfParticipants", NumberOfParticipantsElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -259,7 +235,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -278,7 +254,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -530,39 +506,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Type != null) yield return Type; - if (ValueElement != null) yield return ValueElement; - if (UnitOfMeasure != null) yield return UnitOfMeasure; - if (DenominatorCountElement != null) yield return DenominatorCountElement; - if (NumeratorCountElement != null) yield return NumeratorCountElement; - foreach (var elem in PrecisionEstimate) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Type != null) yield return new ElementValue("type", Type); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (UnitOfMeasure != null) yield return new ElementValue("unitOfMeasure", UnitOfMeasure); - if (DenominatorCountElement != null) yield return new ElementValue("denominatorCount", DenominatorCountElement); - if (NumeratorCountElement != null) yield return new ElementValue("numeratorCount", NumeratorCountElement); - foreach (var elem in PrecisionEstimate) { if (elem != null) yield return new ElementValue("precisionEstimate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -593,7 +537,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -624,7 +568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -812,33 +756,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (LevelElement != null) yield return LevelElement; - if (FromElement != null) yield return FromElement; - if (ToElement != null) yield return ToElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (LevelElement != null) yield return new ElementValue("level", LevelElement); - if (FromElement != null) yield return new ElementValue("from", FromElement); - if (ToElement != null) yield return new ElementValue("to", ToElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -860,7 +778,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -882,7 +800,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1000,31 +918,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Rating) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in CertaintySubcomponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Rating) { if (elem != null) yield return new ElementValue("rating", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in CertaintySubcomponent) { if (elem != null) yield return new ElementValue("certaintySubcomponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1043,7 +937,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1062,7 +956,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Rating?.Any() == true) yield return new KeyValuePair("rating",Rating); @@ -1179,31 +1073,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Rating) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Rating) { if (elem != null) yield return new ElementValue("rating", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1222,7 +1092,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1241,7 +1111,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2013,87 +1883,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (SynthesisType != null) yield return SynthesisType; - if (StudyType != null) yield return StudyType; - if (Population != null) yield return Population; - if (Exposure != null) yield return Exposure; - if (Outcome != null) yield return Outcome; - if (SampleSize != null) yield return SampleSize; - if (RiskEstimate != null) yield return RiskEstimate; - foreach (var elem in Certainty) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (SynthesisType != null) yield return new ElementValue("synthesisType", SynthesisType); - if (StudyType != null) yield return new ElementValue("studyType", StudyType); - if (Population != null) yield return new ElementValue("population", Population); - if (Exposure != null) yield return new ElementValue("exposure", Exposure); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (SampleSize != null) yield return new ElementValue("sampleSize", SampleSize); - if (RiskEstimate != null) yield return new ElementValue("riskEstimate", RiskEstimate); - foreach (var elem in Certainty) { if (elem != null) yield return new ElementValue("certainty", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2196,7 +1986,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2299,7 +2089,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SampledData.cs b/src/Hl7.Fhir.R4/Model/Generated/SampledData.cs index 2fbc6a90ba..123cd2a2d5 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SampledData.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SampledData.cs @@ -322,39 +322,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Origin != null) yield return Origin; - if (PeriodElement != null) yield return PeriodElement; - if (FactorElement != null) yield return FactorElement; - if (LowerLimitElement != null) yield return LowerLimitElement; - if (UpperLimitElement != null) yield return UpperLimitElement; - if (DimensionsElement != null) yield return DimensionsElement; - if (DataElement != null) yield return DataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Origin != null) yield return new ElementValue("origin", Origin); - if (PeriodElement != null) yield return new ElementValue("period", PeriodElement); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (LowerLimitElement != null) yield return new ElementValue("lowerLimit", LowerLimitElement); - if (UpperLimitElement != null) yield return new ElementValue("upperLimit", UpperLimitElement); - if (DimensionsElement != null) yield return new ElementValue("dimensions", DimensionsElement); - if (DataElement != null) yield return new ElementValue("data", DataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -385,7 +353,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -416,7 +384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Origin is not null) yield return new KeyValuePair("origin",Origin); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs b/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs index e1a9e98efa..e0aad53319 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Schedule.cs @@ -271,41 +271,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in ServiceCategory) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Actor) { if (elem != null) yield return elem; } - if (PlanningHorizon != null) yield return PlanningHorizon; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in ServiceCategory) { if (elem != null) yield return new ElementValue("serviceCategory", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - if (PlanningHorizon != null) yield return new ElementValue("planningHorizon", PlanningHorizon); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -339,7 +305,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -373,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs index 9c9b63db38..9c034ca7ec 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SearchParameter.cs @@ -371,29 +371,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DefinitionElement != null) yield return DefinitionElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -409,7 +387,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -425,7 +403,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DefinitionElement is not null) yield return new KeyValuePair("definition",DefinitionElement); @@ -1318,77 +1296,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (DerivedFromElement != null) yield return DerivedFromElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in BaseElement) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (XpathElement != null) yield return XpathElement; - if (XpathUsageElement != null) yield return XpathUsageElement; - foreach (var elem in TargetElement) { if (elem != null) yield return elem; } - if (MultipleOrElement != null) yield return MultipleOrElement; - if (MultipleAndElement != null) yield return MultipleAndElement; - foreach (var elem in ComparatorElement) { if (elem != null) yield return elem; } - foreach (var elem in ModifierElement) { if (elem != null) yield return elem; } - foreach (var elem in ChainElement) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DerivedFromElement != null) yield return new ElementValue("derivedFrom", DerivedFromElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in BaseElement) { if (elem != null) yield return new ElementValue("base", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (XpathElement != null) yield return new ElementValue("xpath", XpathElement); - if (XpathUsageElement != null) yield return new ElementValue("xpathUsage", XpathUsageElement); - foreach (var elem in TargetElement) { if (elem != null) yield return new ElementValue("target", elem); } - if (MultipleOrElement != null) yield return new ElementValue("multipleOr", MultipleOrElement); - if (MultipleAndElement != null) yield return new ElementValue("multipleAnd", MultipleAndElement); - foreach (var elem in ComparatorElement) { if (elem != null) yield return new ElementValue("comparator", elem); } - foreach (var elem in ModifierElement) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ChainElement) { if (elem != null) yield return new ElementValue("chain", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1476,7 +1384,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1564,7 +1472,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs index b25da3d4d3..a03f49e084 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/ServiceRequest.cs @@ -840,91 +840,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (Requisition != null) yield return Requisition; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Code != null) yield return Code; - foreach (var elem in OrderDetail) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (AsNeeded != null) yield return AsNeeded; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (PerformerType != null) yield return PerformerType; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in LocationCode) { if (elem != null) yield return elem; } - foreach (var elem in LocationReference) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (PatientInstructionElement != null) yield return PatientInstructionElement; - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (Requisition != null) yield return new ElementValue("requisition", Requisition); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in OrderDetail) { if (elem != null) yield return new ElementValue("orderDetail", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AsNeeded != null) yield return new ElementValue("asNeeded", AsNeeded); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in LocationCode) { if (elem != null) yield return new ElementValue("locationCode", elem); } - foreach (var elem in LocationReference) { if (elem != null) yield return new ElementValue("locationReference", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (PatientInstructionElement != null) yield return new ElementValue("patientInstruction", PatientInstructionElement); - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1033,7 +949,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1142,7 +1058,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Slot.cs b/src/Hl7.Fhir.R4/Model/Generated/Slot.cs index f65d2dab27..f07e3a7e7a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Slot.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Slot.cs @@ -419,47 +419,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in ServiceCategory) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - if (AppointmentType != null) yield return AppointmentType; - if (Schedule != null) yield return Schedule; - if (StatusElement != null) yield return StatusElement; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (OverbookedElement != null) yield return OverbookedElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in ServiceCategory) { if (elem != null) yield return new ElementValue("serviceCategory", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - if (AppointmentType != null) yield return new ElementValue("appointmentType", AppointmentType); - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (OverbookedElement != null) yield return new ElementValue("overbooked", OverbookedElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -502,7 +462,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -545,7 +505,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs index 65a5df9e61..ca78926b45 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Specimen.cs @@ -269,39 +269,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Collector != null) yield return Collector; - if (Collected != null) yield return Collected; - if (Duration != null) yield return Duration; - if (Quantity != null) yield return Quantity; - if (Method != null) yield return Method; - if (BodySite != null) yield return BodySite; - if (FastingStatus != null) yield return FastingStatus; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Collector != null) yield return new ElementValue("collector", Collector); - if (Collected != null) yield return new ElementValue("collected", Collected); - if (Duration != null) yield return new ElementValue("duration", Duration); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Method != null) yield return new ElementValue("method", Method); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (FastingStatus != null) yield return new ElementValue("fastingStatus", FastingStatus); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -332,7 +300,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -363,7 +331,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Collector is not null) yield return new KeyValuePair("collector",Collector); @@ -520,33 +488,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Procedure != null) yield return Procedure; - foreach (var elem in Additive) { if (elem != null) yield return elem; } - if (Time != null) yield return Time; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - foreach (var elem in Additive) { if (elem != null) yield return new ElementValue("additive", elem); } - if (Time != null) yield return new ElementValue("time", Time); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -568,7 +510,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -590,7 +532,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -776,37 +718,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (Type != null) yield return Type; - if (Capacity != null) yield return Capacity; - if (SpecimenQuantity != null) yield return SpecimenQuantity; - if (Additive != null) yield return Additive; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Capacity != null) yield return new ElementValue("capacity", Capacity); - if (SpecimenQuantity != null) yield return new ElementValue("specimenQuantity", SpecimenQuantity); - if (Additive != null) yield return new ElementValue("additive", Additive); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -834,7 +746,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -862,7 +774,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1180,51 +1092,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (AccessionIdentifier != null) yield return AccessionIdentifier; - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (ReceivedTimeElement != null) yield return ReceivedTimeElement; - foreach (var elem in Parent) { if (elem != null) yield return elem; } - foreach (var elem in Request) { if (elem != null) yield return elem; } - if (Collection != null) yield return Collection; - foreach (var elem in Processing) { if (elem != null) yield return elem; } - foreach (var elem in Container) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (AccessionIdentifier != null) yield return new ElementValue("accessionIdentifier", AccessionIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (ReceivedTimeElement != null) yield return new ElementValue("receivedTime", ReceivedTimeElement); - foreach (var elem in Parent) { if (elem != null) yield return new ElementValue("parent", elem); } - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - if (Collection != null) yield return new ElementValue("collection", Collection); - foreach (var elem in Processing) { if (elem != null) yield return new ElementValue("processing", elem); } - foreach (var elem in Container) { if (elem != null) yield return new ElementValue("container", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1273,7 +1141,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1322,7 +1190,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs index 157b8ba93a..3797dbd6de 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SpecimenDefinition.cs @@ -325,41 +325,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IsDerivedElement != null) yield return IsDerivedElement; - if (Type != null) yield return Type; - if (PreferenceElement != null) yield return PreferenceElement; - if (Container != null) yield return Container; - if (RequirementElement != null) yield return RequirementElement; - if (RetentionTime != null) yield return RetentionTime; - foreach (var elem in RejectionCriterion) { if (elem != null) yield return elem; } - foreach (var elem in Handling) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IsDerivedElement != null) yield return new ElementValue("isDerived", IsDerivedElement); - if (Type != null) yield return new ElementValue("type", Type); - if (PreferenceElement != null) yield return new ElementValue("preference", PreferenceElement); - if (Container != null) yield return new ElementValue("container", Container); - if (RequirementElement != null) yield return new ElementValue("requirement", RequirementElement); - if (RetentionTime != null) yield return new ElementValue("retentionTime", RetentionTime); - foreach (var elem in RejectionCriterion) { if (elem != null) yield return new ElementValue("rejectionCriterion", elem); } - foreach (var elem in Handling) { if (elem != null) yield return new ElementValue("handling", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -393,7 +359,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -427,7 +393,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IsDerivedElement is not null) yield return new KeyValuePair("isDerived",IsDerivedElement); @@ -664,41 +630,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Material != null) yield return Material; - if (Type != null) yield return Type; - if (Cap != null) yield return Cap; - if (DescriptionElement != null) yield return DescriptionElement; - if (Capacity != null) yield return Capacity; - if (MinimumVolume != null) yield return MinimumVolume; - foreach (var elem in Additive) { if (elem != null) yield return elem; } - if (PreparationElement != null) yield return PreparationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Material != null) yield return new ElementValue("material", Material); - if (Type != null) yield return new ElementValue("type", Type); - if (Cap != null) yield return new ElementValue("cap", Cap); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Capacity != null) yield return new ElementValue("capacity", Capacity); - if (MinimumVolume != null) yield return new ElementValue("minimumVolume", MinimumVolume); - foreach (var elem in Additive) { if (elem != null) yield return new ElementValue("additive", elem); } - if (PreparationElement != null) yield return new ElementValue("preparation", PreparationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -732,7 +664,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -766,7 +698,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Material is not null) yield return new KeyValuePair("material",Material); @@ -857,27 +789,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Additive != null) yield return Additive; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Additive != null) yield return new ElementValue("additive", Additive); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -890,7 +802,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -903,7 +815,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Additive is not null) yield return new KeyValuePair("additive",Additive); @@ -1049,33 +961,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TemperatureQualifier != null) yield return TemperatureQualifier; - if (TemperatureRange != null) yield return TemperatureRange; - if (MaxDuration != null) yield return MaxDuration; - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TemperatureQualifier != null) yield return new ElementValue("temperatureQualifier", TemperatureQualifier); - if (TemperatureRange != null) yield return new ElementValue("temperatureRange", TemperatureRange); - if (MaxDuration != null) yield return new ElementValue("maxDuration", MaxDuration); - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1097,7 +983,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1119,7 +1005,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TemperatureQualifier is not null) yield return new KeyValuePair("temperatureQualifier",TemperatureQualifier); @@ -1291,37 +1177,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (TypeCollected != null) yield return TypeCollected; - foreach (var elem in PatientPreparation) { if (elem != null) yield return elem; } - if (TimeAspectElement != null) yield return TimeAspectElement; - foreach (var elem in Collection) { if (elem != null) yield return elem; } - foreach (var elem in TypeTested) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (TypeCollected != null) yield return new ElementValue("typeCollected", TypeCollected); - foreach (var elem in PatientPreparation) { if (elem != null) yield return new ElementValue("patientPreparation", elem); } - if (TimeAspectElement != null) yield return new ElementValue("timeAspect", TimeAspectElement); - foreach (var elem in Collection) { if (elem != null) yield return new ElementValue("collection", elem); } - foreach (var elem in TypeTested) { if (elem != null) yield return new ElementValue("typeTested", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1349,7 +1205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1377,7 +1233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs index c90eb80d97..4f27adb787 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/StructureMap.cs @@ -544,33 +544,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (ModeElement != null) yield return ModeElement; - if (AliasElement != null) yield return AliasElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (AliasElement != null) yield return new ElementValue("alias", AliasElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -592,7 +566,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -614,7 +588,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); @@ -854,37 +828,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ExtendsElement != null) yield return ExtendsElement; - if (TypeModeElement != null) yield return TypeModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ExtendsElement != null) yield return new ElementValue("extends", ExtendsElement); - if (TypeModeElement != null) yield return new ElementValue("typeMode", TypeModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -912,7 +856,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -940,7 +884,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1149,33 +1093,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TypeElement != null) yield return TypeElement; - if (ModeElement != null) yield return ModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1197,7 +1115,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1219,7 +1137,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1419,37 +1337,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in Source) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - foreach (var elem in Dependent) { if (elem != null) yield return elem; } - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - foreach (var elem in Dependent) { if (elem != null) yield return new ElementValue("dependent", elem); } - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1477,7 +1365,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1505,7 +1393,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1931,47 +1819,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContextElement != null) yield return ContextElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (TypeElement != null) yield return TypeElement; - if (DefaultValue != null) yield return DefaultValue; - if (ElementElement != null) yield return ElementElement; - if (ListModeElement != null) yield return ListModeElement; - if (VariableElement != null) yield return VariableElement; - if (ConditionElement != null) yield return ConditionElement; - if (CheckElement != null) yield return CheckElement; - if (LogMessageElement != null) yield return LogMessageElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContextElement != null) yield return new ElementValue("context", ContextElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DefaultValue != null) yield return new ElementValue("defaultValue", DefaultValue); - if (ElementElement != null) yield return new ElementValue("element", ElementElement); - if (ListModeElement != null) yield return new ElementValue("listMode", ListModeElement); - if (VariableElement != null) yield return new ElementValue("variable", VariableElement); - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - if (CheckElement != null) yield return new ElementValue("check", CheckElement); - if (LogMessageElement != null) yield return new ElementValue("logMessage", LogMessageElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2014,7 +1862,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2057,7 +1905,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContextElement is not null) yield return new KeyValuePair("context",ContextElement); @@ -2389,41 +2237,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContextElement != null) yield return ContextElement; - if (ContextTypeElement != null) yield return ContextTypeElement; - if (ElementElement != null) yield return ElementElement; - if (VariableElement != null) yield return VariableElement; - foreach (var elem in ListModeElement) { if (elem != null) yield return elem; } - if (ListRuleIdElement != null) yield return ListRuleIdElement; - if (TransformElement != null) yield return TransformElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContextElement != null) yield return new ElementValue("context", ContextElement); - if (ContextTypeElement != null) yield return new ElementValue("contextType", ContextTypeElement); - if (ElementElement != null) yield return new ElementValue("element", ElementElement); - if (VariableElement != null) yield return new ElementValue("variable", VariableElement); - foreach (var elem in ListModeElement) { if (elem != null) yield return new ElementValue("listMode", elem); } - if (ListRuleIdElement != null) yield return new ElementValue("listRuleId", ListRuleIdElement); - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2457,7 +2271,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2491,7 +2305,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContextElement is not null) yield return new KeyValuePair("context",ContextElement); @@ -2577,27 +2391,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2610,7 +2404,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2623,7 +2417,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2753,29 +2547,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in VariableElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in VariableElement) { if (elem != null) yield return new ElementValue("variable", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2791,7 +2563,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2807,7 +2579,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -3374,61 +3146,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in Structure) { if (elem != null) yield return elem; } - foreach (var elem in ImportElement) { if (elem != null) yield return elem; } - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in Structure) { if (elem != null) yield return new ElementValue("structure", elem); } - foreach (var elem in ImportElement) { if (elem != null) yield return new ElementValue("import", elem); } - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3492,7 +3210,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3556,7 +3274,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs index d2afd1b39e..37a2c1fa17 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Subscription.cs @@ -329,33 +329,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (EndpointElement != null) yield return EndpointElement; - if (PayloadElement != null) yield return PayloadElement; - foreach (var elem in HeaderElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - if (PayloadElement != null) yield return new ElementValue("payload", PayloadElement); - foreach (var elem in HeaderElement) { if (elem != null) yield return new ElementValue("header", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -377,7 +351,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -399,7 +373,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -658,39 +632,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (EndElement != null) yield return EndElement; - if (ReasonElement != null) yield return ReasonElement; - if (CriteriaElement != null) yield return CriteriaElement; - if (ErrorElement != null) yield return ErrorElement; - if (Channel != null) yield return Channel; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (ReasonElement != null) yield return new ElementValue("reason", ReasonElement); - if (CriteriaElement != null) yield return new ElementValue("criteria", CriteriaElement); - if (ErrorElement != null) yield return new ElementValue("error", ErrorElement); - if (Channel != null) yield return new ElementValue("channel", Channel); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -721,7 +663,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -752,7 +694,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Substance.cs b/src/Hl7.Fhir.R4/Model/Generated/Substance.cs index d386e66e3e..f5863de01c 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Substance.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Substance.cs @@ -205,31 +205,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (ExpiryElement != null) yield return ExpiryElement; - if (Quantity != null) yield return Quantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (ExpiryElement != null) yield return new ElementValue("expiry", ExpiryElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -248,7 +224,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -267,7 +243,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -369,29 +345,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Substance != null) yield return Substance; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Substance != null) yield return new ElementValue("substance", Substance); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -407,7 +361,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -423,7 +377,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -633,39 +587,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -696,7 +618,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -727,7 +649,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs index 2cccf107fa..027c19dde0 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceAmount.cs @@ -140,29 +140,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LowLimit != null) yield return LowLimit; - if (HighLimit != null) yield return HighLimit; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LowLimit != null) yield return new ElementValue("lowLimit", LowLimit); - if (HighLimit != null) yield return new ElementValue("highLimit", HighLimit); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -178,7 +156,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -194,7 +172,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LowLimit is not null) yield return new KeyValuePair("lowLimit",LowLimit); @@ -326,33 +304,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Amount != null) yield return Amount; - if (AmountType != null) yield return AmountType; - if (AmountTextElement != null) yield return AmountTextElement; - if (ReferenceRange != null) yield return ReferenceRange; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Amount != null) yield return new ElementValue("amount", Amount); - if (AmountType != null) yield return new ElementValue("amountType", AmountType); - if (AmountTextElement != null) yield return new ElementValue("amountText", AmountTextElement); - if (ReferenceRange != null) yield return new ElementValue("referenceRange", ReferenceRange); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -374,7 +326,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -396,7 +348,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Amount is not null) yield return new KeyValuePair("amount",Amount); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs index 97fef2e004..dd35db5374 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceNucleicAcid.cs @@ -292,41 +292,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SubunitElement != null) yield return SubunitElement; - if (SequenceElement != null) yield return SequenceElement; - if (LengthElement != null) yield return LengthElement; - if (SequenceAttachment != null) yield return SequenceAttachment; - if (FivePrime != null) yield return FivePrime; - if (ThreePrime != null) yield return ThreePrime; - foreach (var elem in Linkage) { if (elem != null) yield return elem; } - foreach (var elem in Sugar) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SubunitElement != null) yield return new ElementValue("subunit", SubunitElement); - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (LengthElement != null) yield return new ElementValue("length", LengthElement); - if (SequenceAttachment != null) yield return new ElementValue("sequenceAttachment", SequenceAttachment); - if (FivePrime != null) yield return new ElementValue("fivePrime", FivePrime); - if (ThreePrime != null) yield return new ElementValue("threePrime", ThreePrime); - foreach (var elem in Linkage) { if (elem != null) yield return new ElementValue("linkage", elem); } - foreach (var elem in Sugar) { if (elem != null) yield return new ElementValue("sugar", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -360,7 +326,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -394,7 +360,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SubunitElement is not null) yield return new KeyValuePair("subunit",SubunitElement); @@ -579,33 +545,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ConnectivityElement != null) yield return ConnectivityElement; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (ResidueSiteElement != null) yield return ResidueSiteElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ConnectivityElement != null) yield return new ElementValue("connectivity", ConnectivityElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ResidueSiteElement != null) yield return new ElementValue("residueSite", ResidueSiteElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -627,7 +567,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -649,7 +589,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ConnectivityElement is not null) yield return new KeyValuePair("connectivity",ConnectivityElement); @@ -796,31 +736,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (ResidueSiteElement != null) yield return ResidueSiteElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ResidueSiteElement != null) yield return new ElementValue("residueSite", ResidueSiteElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -839,7 +755,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -858,7 +774,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1024,35 +940,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceType != null) yield return SequenceType; - if (NumberOfSubunitsElement != null) yield return NumberOfSubunitsElement; - if (AreaOfHybridisationElement != null) yield return AreaOfHybridisationElement; - if (OligoNucleotideType != null) yield return OligoNucleotideType; - foreach (var elem in Subunit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceType != null) yield return new ElementValue("sequenceType", SequenceType); - if (NumberOfSubunitsElement != null) yield return new ElementValue("numberOfSubunits", NumberOfSubunitsElement); - if (AreaOfHybridisationElement != null) yield return new ElementValue("areaOfHybridisation", AreaOfHybridisationElement); - if (OligoNucleotideType != null) yield return new ElementValue("oligoNucleotideType", OligoNucleotideType); - foreach (var elem in Subunit) { if (elem != null) yield return new ElementValue("subunit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1077,7 +965,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1102,7 +990,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceType is not null) yield return new KeyValuePair("sequenceType",SequenceType); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs index b6366ac49d..74f30b284b 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstancePolymer.cs @@ -141,29 +141,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RatioType != null) yield return RatioType; - foreach (var elem in StartingMaterial) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RatioType != null) yield return new ElementValue("ratioType", RatioType); - foreach (var elem in StartingMaterial) { if (elem != null) yield return new ElementValue("startingMaterial", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -179,7 +157,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -195,7 +173,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RatioType is not null) yield return new KeyValuePair("ratioType",RatioType); @@ -338,33 +316,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Material != null) yield return Material; - if (Type != null) yield return Type; - if (IsDefiningElement != null) yield return IsDefiningElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Material != null) yield return new ElementValue("material", Material); - if (Type != null) yield return new ElementValue("type", Type); - if (IsDefiningElement != null) yield return new ElementValue("isDefining", IsDefiningElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -386,7 +338,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -408,7 +360,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Material is not null) yield return new KeyValuePair("material",Material); @@ -572,33 +524,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberOfUnitsElement != null) yield return NumberOfUnitsElement; - if (AverageMolecularFormulaElement != null) yield return AverageMolecularFormulaElement; - if (RepeatUnitAmountType != null) yield return RepeatUnitAmountType; - foreach (var elem in RepeatUnit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberOfUnitsElement != null) yield return new ElementValue("numberOfUnits", NumberOfUnitsElement); - if (AverageMolecularFormulaElement != null) yield return new ElementValue("averageMolecularFormula", AverageMolecularFormulaElement); - if (RepeatUnitAmountType != null) yield return new ElementValue("repeatUnitAmountType", RepeatUnitAmountType); - foreach (var elem in RepeatUnit) { if (elem != null) yield return new ElementValue("repeatUnit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -620,7 +546,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -642,7 +568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberOfUnitsElement is not null) yield return new KeyValuePair("numberOfUnits",NumberOfUnitsElement); @@ -805,35 +731,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (OrientationOfPolymerisation != null) yield return OrientationOfPolymerisation; - if (RepeatUnitElement != null) yield return RepeatUnitElement; - if (Amount != null) yield return Amount; - foreach (var elem in DegreeOfPolymerisation) { if (elem != null) yield return elem; } - foreach (var elem in StructuralRepresentation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (OrientationOfPolymerisation != null) yield return new ElementValue("orientationOfPolymerisation", OrientationOfPolymerisation); - if (RepeatUnitElement != null) yield return new ElementValue("repeatUnit", RepeatUnitElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - foreach (var elem in DegreeOfPolymerisation) { if (elem != null) yield return new ElementValue("degreeOfPolymerisation", elem); } - foreach (var elem in StructuralRepresentation) { if (elem != null) yield return new ElementValue("structuralRepresentation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -858,7 +756,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -883,7 +781,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (OrientationOfPolymerisation is not null) yield return new KeyValuePair("orientationOfPolymerisation",OrientationOfPolymerisation); @@ -979,29 +877,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Degree != null) yield return Degree; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Degree != null) yield return new ElementValue("degree", Degree); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1017,7 +893,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1033,7 +909,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Degree is not null) yield return new KeyValuePair("degree",Degree); @@ -1160,31 +1036,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (RepresentationElement != null) yield return RepresentationElement; - if (Attachment != null) yield return Attachment; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (RepresentationElement != null) yield return new ElementValue("representation", RepresentationElement); - if (Attachment != null) yield return new ElementValue("attachment", Attachment); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1203,7 +1055,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1222,7 +1074,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1389,37 +1241,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Class != null) yield return Class; - if (Geometry != null) yield return Geometry; - foreach (var elem in CopolymerConnectivity) { if (elem != null) yield return elem; } - foreach (var elem in ModificationElement) { if (elem != null) yield return elem; } - foreach (var elem in MonomerSet) { if (elem != null) yield return elem; } - foreach (var elem in Repeat) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Class != null) yield return new ElementValue("class", Class); - if (Geometry != null) yield return new ElementValue("geometry", Geometry); - foreach (var elem in CopolymerConnectivity) { if (elem != null) yield return new ElementValue("copolymerConnectivity", elem); } - foreach (var elem in ModificationElement) { if (elem != null) yield return new ElementValue("modification", elem); } - foreach (var elem in MonomerSet) { if (elem != null) yield return new ElementValue("monomerSet", elem); } - foreach (var elem in Repeat) { if (elem != null) yield return new ElementValue("repeat", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1447,7 +1269,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1475,7 +1297,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Class is not null) yield return new KeyValuePair("class",Class); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs index f093f7322f..b11a84c270 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceProtein.cs @@ -326,41 +326,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SubunitElement != null) yield return SubunitElement; - if (SequenceElement != null) yield return SequenceElement; - if (LengthElement != null) yield return LengthElement; - if (SequenceAttachment != null) yield return SequenceAttachment; - if (NTerminalModificationId != null) yield return NTerminalModificationId; - if (NTerminalModificationElement != null) yield return NTerminalModificationElement; - if (CTerminalModificationId != null) yield return CTerminalModificationId; - if (CTerminalModificationElement != null) yield return CTerminalModificationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SubunitElement != null) yield return new ElementValue("subunit", SubunitElement); - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (LengthElement != null) yield return new ElementValue("length", LengthElement); - if (SequenceAttachment != null) yield return new ElementValue("sequenceAttachment", SequenceAttachment); - if (NTerminalModificationId != null) yield return new ElementValue("nTerminalModificationId", NTerminalModificationId); - if (NTerminalModificationElement != null) yield return new ElementValue("nTerminalModification", NTerminalModificationElement); - if (CTerminalModificationId != null) yield return new ElementValue("cTerminalModificationId", CTerminalModificationId); - if (CTerminalModificationElement != null) yield return new ElementValue("cTerminalModification", CTerminalModificationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -394,7 +360,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -428,7 +394,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SubunitElement is not null) yield return new KeyValuePair("subunit",SubunitElement); @@ -584,33 +550,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceType != null) yield return SequenceType; - if (NumberOfSubunitsElement != null) yield return NumberOfSubunitsElement; - foreach (var elem in DisulfideLinkageElement) { if (elem != null) yield return elem; } - foreach (var elem in Subunit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceType != null) yield return new ElementValue("sequenceType", SequenceType); - if (NumberOfSubunitsElement != null) yield return new ElementValue("numberOfSubunits", NumberOfSubunitsElement); - foreach (var elem in DisulfideLinkageElement) { if (elem != null) yield return new ElementValue("disulfideLinkage", elem); } - foreach (var elem in Subunit) { if (elem != null) yield return new ElementValue("subunit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -632,7 +572,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -654,7 +594,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceType is not null) yield return new KeyValuePair("sequenceType",SequenceType); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs index bfc69a78e2..d4bd359a99 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceReferenceInformation.cs @@ -159,31 +159,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (GeneSequenceOrigin != null) yield return GeneSequenceOrigin; - if (Gene != null) yield return Gene; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (GeneSequenceOrigin != null) yield return new ElementValue("geneSequenceOrigin", GeneSequenceOrigin); - if (Gene != null) yield return new ElementValue("gene", Gene); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -202,7 +178,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -221,7 +197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (GeneSequenceOrigin is not null) yield return new KeyValuePair("geneSequenceOrigin",GeneSequenceOrigin); @@ -334,31 +310,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Element != null) yield return Element; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Element != null) yield return new ElementValue("element", Element); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -377,7 +329,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -396,7 +348,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -526,33 +478,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Domain != null) yield return Domain; - if (Classification != null) yield return Classification; - foreach (var elem in Subtype) { if (elem != null) yield return elem; } - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Domain != null) yield return new ElementValue("domain", Domain); - if (Classification != null) yield return new ElementValue("classification", Classification); - foreach (var elem in Subtype) { if (elem != null) yield return new ElementValue("subtype", elem); } - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -574,7 +500,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -596,7 +522,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Domain is not null) yield return new KeyValuePair("domain",Domain); @@ -792,41 +718,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Target != null) yield return Target; - if (Type != null) yield return Type; - if (Interaction != null) yield return Interaction; - if (Organism != null) yield return Organism; - if (OrganismType != null) yield return OrganismType; - if (Amount != null) yield return Amount; - if (AmountType != null) yield return AmountType; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Target != null) yield return new ElementValue("target", Target); - if (Type != null) yield return new ElementValue("type", Type); - if (Interaction != null) yield return new ElementValue("interaction", Interaction); - if (Organism != null) yield return new ElementValue("organism", Organism); - if (OrganismType != null) yield return new ElementValue("organismType", OrganismType); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (AmountType != null) yield return new ElementValue("amountType", AmountType); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -860,7 +752,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -894,7 +786,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target is not null) yield return new KeyValuePair("target",Target); @@ -1050,35 +942,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CommentElement != null) yield return CommentElement; - foreach (var elem in Gene) { if (elem != null) yield return elem; } - foreach (var elem in GeneElement) { if (elem != null) yield return elem; } - foreach (var elem in Classification) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in Gene) { if (elem != null) yield return new ElementValue("gene", elem); } - foreach (var elem in GeneElement) { if (elem != null) yield return new ElementValue("geneElement", elem); } - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1103,7 +967,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1128,7 +992,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CommentElement is not null) yield return new KeyValuePair("comment",CommentElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs index b78fa85ac0..0eed30ecdb 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSourceMaterial.cs @@ -158,29 +158,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FractionElement != null) yield return FractionElement; - if (MaterialType != null) yield return MaterialType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FractionElement != null) yield return new ElementValue("fraction", FractionElement); - if (MaterialType != null) yield return new ElementValue("materialType", MaterialType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -196,7 +174,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -212,7 +190,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FractionElement is not null) yield return new KeyValuePair("fraction",FractionElement); @@ -420,41 +398,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Family != null) yield return Family; - if (Genus != null) yield return Genus; - if (Species != null) yield return Species; - if (IntraspecificType != null) yield return IntraspecificType; - if (IntraspecificDescriptionElement != null) yield return IntraspecificDescriptionElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Hybrid != null) yield return Hybrid; - if (OrganismGeneral != null) yield return OrganismGeneral; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Family != null) yield return new ElementValue("family", Family); - if (Genus != null) yield return new ElementValue("genus", Genus); - if (Species != null) yield return new ElementValue("species", Species); - if (IntraspecificType != null) yield return new ElementValue("intraspecificType", IntraspecificType); - if (IntraspecificDescriptionElement != null) yield return new ElementValue("intraspecificDescription", IntraspecificDescriptionElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Hybrid != null) yield return new ElementValue("hybrid", Hybrid); - if (OrganismGeneral != null) yield return new ElementValue("organismGeneral", OrganismGeneral); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -488,7 +432,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -522,7 +466,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Family is not null) yield return new KeyValuePair("family",Family); @@ -639,29 +583,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AuthorType != null) yield return AuthorType; - if (AuthorDescriptionElement != null) yield return AuthorDescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AuthorType != null) yield return new ElementValue("authorType", AuthorType); - if (AuthorDescriptionElement != null) yield return new ElementValue("authorDescription", AuthorDescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -677,7 +599,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -693,7 +615,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AuthorType is not null) yield return new KeyValuePair("authorType",AuthorType); @@ -906,35 +828,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MaternalOrganismIdElement != null) yield return MaternalOrganismIdElement; - if (MaternalOrganismNameElement != null) yield return MaternalOrganismNameElement; - if (PaternalOrganismIdElement != null) yield return PaternalOrganismIdElement; - if (PaternalOrganismNameElement != null) yield return PaternalOrganismNameElement; - if (HybridType != null) yield return HybridType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MaternalOrganismIdElement != null) yield return new ElementValue("maternalOrganismId", MaternalOrganismIdElement); - if (MaternalOrganismNameElement != null) yield return new ElementValue("maternalOrganismName", MaternalOrganismNameElement); - if (PaternalOrganismIdElement != null) yield return new ElementValue("paternalOrganismId", PaternalOrganismIdElement); - if (PaternalOrganismNameElement != null) yield return new ElementValue("paternalOrganismName", PaternalOrganismNameElement); - if (HybridType != null) yield return new ElementValue("hybridType", HybridType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -959,7 +853,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -984,7 +878,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MaternalOrganismIdElement is not null) yield return new KeyValuePair("maternalOrganismId",MaternalOrganismIdElement); @@ -1112,33 +1006,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Kingdom != null) yield return Kingdom; - if (Phylum != null) yield return Phylum; - if (Class != null) yield return Class; - if (Order != null) yield return Order; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Kingdom != null) yield return new ElementValue("kingdom", Kingdom); - if (Phylum != null) yield return new ElementValue("phylum", Phylum); - if (Class != null) yield return new ElementValue("class", Class); - if (Order != null) yield return new ElementValue("order", Order); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1160,7 +1028,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1182,7 +1050,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Kingdom is not null) yield return new KeyValuePair("kingdom",Kingdom); @@ -1277,29 +1145,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Part != null) yield return Part; - if (PartLocation != null) yield return PartLocation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Part != null) yield return new ElementValue("part", Part); - if (PartLocation != null) yield return new ElementValue("partLocation", PartLocation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1315,7 +1161,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1331,7 +1177,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Part is not null) yield return new KeyValuePair("part",Part); @@ -1647,51 +1493,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceMaterialClass != null) yield return SourceMaterialClass; - if (SourceMaterialType != null) yield return SourceMaterialType; - if (SourceMaterialState != null) yield return SourceMaterialState; - if (OrganismId != null) yield return OrganismId; - if (OrganismNameElement != null) yield return OrganismNameElement; - foreach (var elem in ParentSubstanceId) { if (elem != null) yield return elem; } - foreach (var elem in ParentSubstanceNameElement) { if (elem != null) yield return elem; } - foreach (var elem in CountryOfOrigin) { if (elem != null) yield return elem; } - foreach (var elem in GeographicalLocationElement) { if (elem != null) yield return elem; } - if (DevelopmentStage != null) yield return DevelopmentStage; - foreach (var elem in FractionDescription) { if (elem != null) yield return elem; } - if (Organism != null) yield return Organism; - foreach (var elem in PartDescription) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceMaterialClass != null) yield return new ElementValue("sourceMaterialClass", SourceMaterialClass); - if (SourceMaterialType != null) yield return new ElementValue("sourceMaterialType", SourceMaterialType); - if (SourceMaterialState != null) yield return new ElementValue("sourceMaterialState", SourceMaterialState); - if (OrganismId != null) yield return new ElementValue("organismId", OrganismId); - if (OrganismNameElement != null) yield return new ElementValue("organismName", OrganismNameElement); - foreach (var elem in ParentSubstanceId) { if (elem != null) yield return new ElementValue("parentSubstanceId", elem); } - foreach (var elem in ParentSubstanceNameElement) { if (elem != null) yield return new ElementValue("parentSubstanceName", elem); } - foreach (var elem in CountryOfOrigin) { if (elem != null) yield return new ElementValue("countryOfOrigin", elem); } - foreach (var elem in GeographicalLocationElement) { if (elem != null) yield return new ElementValue("geographicalLocation", elem); } - if (DevelopmentStage != null) yield return new ElementValue("developmentStage", DevelopmentStage); - foreach (var elem in FractionDescription) { if (elem != null) yield return new ElementValue("fractionDescription", elem); } - if (Organism != null) yield return new ElementValue("organism", Organism); - foreach (var elem in PartDescription) { if (elem != null) yield return new ElementValue("partDescription", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1740,7 +1542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1789,7 +1591,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceMaterialClass is not null) yield return new KeyValuePair("sourceMaterialClass",SourceMaterialClass); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs index e7ea4d3aeb..6a03d4a055 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SubstanceSpecification.cs @@ -258,39 +258,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (Stereochemistry != null) yield return Stereochemistry; - if (OpticalActivity != null) yield return OpticalActivity; - if (MolecularFormulaElement != null) yield return MolecularFormulaElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Stereochemistry != null) yield return new ElementValue("stereochemistry", Stereochemistry); - if (OpticalActivity != null) yield return new ElementValue("opticalActivity", OpticalActivity); - if (MolecularFormulaElement != null) yield return new ElementValue("molecularFormula", MolecularFormulaElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -321,7 +289,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -352,7 +320,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -521,35 +489,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (ParametersElement != null) yield return ParametersElement; - if (DefiningSubstance != null) yield return DefiningSubstance; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (ParametersElement != null) yield return new ElementValue("parameters", ParametersElement); - if (DefiningSubstance != null) yield return new ElementValue("definingSubstance", DefiningSubstance); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -574,7 +514,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -599,7 +539,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -832,41 +772,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Stereochemistry != null) yield return Stereochemistry; - if (OpticalActivity != null) yield return OpticalActivity; - if (MolecularFormulaElement != null) yield return MolecularFormulaElement; - if (MolecularFormulaByMoietyElement != null) yield return MolecularFormulaByMoietyElement; - foreach (var elem in Isotope) { if (elem != null) yield return elem; } - if (MolecularWeight != null) yield return MolecularWeight; - foreach (var elem in Source) { if (elem != null) yield return elem; } - foreach (var elem in Representation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Stereochemistry != null) yield return new ElementValue("stereochemistry", Stereochemistry); - if (OpticalActivity != null) yield return new ElementValue("opticalActivity", OpticalActivity); - if (MolecularFormulaElement != null) yield return new ElementValue("molecularFormula", MolecularFormulaElement); - if (MolecularFormulaByMoietyElement != null) yield return new ElementValue("molecularFormulaByMoiety", MolecularFormulaByMoietyElement); - foreach (var elem in Isotope) { if (elem != null) yield return new ElementValue("isotope", elem); } - if (MolecularWeight != null) yield return new ElementValue("molecularWeight", MolecularWeight); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - foreach (var elem in Representation) { if (elem != null) yield return new ElementValue("representation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -900,7 +806,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -934,7 +840,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Stereochemistry is not null) yield return new KeyValuePair("stereochemistry",Stereochemistry); @@ -1081,35 +987,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Name != null) yield return Name; - if (Substitution != null) yield return Substitution; - if (HalfLife != null) yield return HalfLife; - if (MolecularWeight != null) yield return MolecularWeight; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Name != null) yield return new ElementValue("name", Name); - if (Substitution != null) yield return new ElementValue("substitution", Substitution); - if (HalfLife != null) yield return new ElementValue("halfLife", HalfLife); - if (MolecularWeight != null) yield return new ElementValue("molecularWeight", MolecularWeight); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1134,7 +1012,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1159,7 +1037,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1271,31 +1149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Method != null) yield return Method; - if (Type != null) yield return Type; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Method != null) yield return new ElementValue("method", Method); - if (Type != null) yield return new ElementValue("type", Type); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1314,7 +1168,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1333,7 +1187,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Method is not null) yield return new KeyValuePair("method",Method); @@ -1461,31 +1315,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (RepresentationElement != null) yield return RepresentationElement; - if (Attachment != null) yield return Attachment; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (RepresentationElement != null) yield return new ElementValue("representation", RepresentationElement); - if (Attachment != null) yield return new ElementValue("attachment", Attachment); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1504,7 +1334,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1523,7 +1353,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1704,35 +1534,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - if (CommentElement != null) yield return CommentElement; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1757,7 +1559,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1782,7 +1584,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -2068,47 +1870,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - if (Status != null) yield return Status; - if (PreferredElement != null) yield return PreferredElement; - foreach (var elem in Language) { if (elem != null) yield return elem; } - foreach (var elem in Domain) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in Synonym) { if (elem != null) yield return elem; } - foreach (var elem in Translation) { if (elem != null) yield return elem; } - foreach (var elem in Official) { if (elem != null) yield return elem; } - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Status != null) yield return new ElementValue("status", Status); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - foreach (var elem in Language) { if (elem != null) yield return new ElementValue("language", elem); } - foreach (var elem in Domain) { if (elem != null) yield return new ElementValue("domain", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in Synonym) { if (elem != null) yield return new ElementValue("synonym", elem); } - foreach (var elem in Translation) { if (elem != null) yield return new ElementValue("translation", elem); } - foreach (var elem in Official) { if (elem != null) yield return new ElementValue("official", elem); } - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2151,7 +1913,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2194,7 +1956,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2330,31 +2092,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Authority != null) yield return Authority; - if (Status != null) yield return Status; - if (DateElement != null) yield return DateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Authority != null) yield return new ElementValue("authority", Authority); - if (Status != null) yield return new ElementValue("status", Status); - if (DateElement != null) yield return new ElementValue("date", DateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2373,7 +2111,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2392,7 +2130,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Authority is not null) yield return new KeyValuePair("authority",Authority); @@ -2592,39 +2330,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - if (Relationship != null) yield return Relationship; - if (IsDefiningElement != null) yield return IsDefiningElement; - if (Amount != null) yield return Amount; - if (AmountRatioLowLimit != null) yield return AmountRatioLowLimit; - if (AmountType != null) yield return AmountType; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (IsDefiningElement != null) yield return new ElementValue("isDefining", IsDefiningElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (AmountRatioLowLimit != null) yield return new ElementValue("amountRatioLowLimit", AmountRatioLowLimit); - if (AmountType != null) yield return new ElementValue("amountType", AmountType); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2655,7 +2361,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2686,7 +2392,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -3100,63 +2806,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Type != null) yield return Type; - if (Status != null) yield return Status; - if (Domain != null) yield return Domain; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Source) { if (elem != null) yield return elem; } - if (CommentElement != null) yield return CommentElement; - foreach (var elem in Moiety) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - if (ReferenceInformation != null) yield return ReferenceInformation; - if (Structure != null) yield return Structure; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in MolecularWeight) { if (elem != null) yield return elem; } - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - if (NucleicAcid != null) yield return NucleicAcid; - if (Polymer != null) yield return Polymer; - if (Protein != null) yield return Protein; - if (SourceMaterial != null) yield return SourceMaterial; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Type != null) yield return new ElementValue("type", Type); - if (Status != null) yield return new ElementValue("status", Status); - if (Domain != null) yield return new ElementValue("domain", Domain); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in Moiety) { if (elem != null) yield return new ElementValue("moiety", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - if (ReferenceInformation != null) yield return new ElementValue("referenceInformation", ReferenceInformation); - if (Structure != null) yield return new ElementValue("structure", Structure); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in MolecularWeight) { if (elem != null) yield return new ElementValue("molecularWeight", elem); } - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - if (NucleicAcid != null) yield return new ElementValue("nucleicAcid", NucleicAcid); - if (Polymer != null) yield return new ElementValue("polymer", Polymer); - if (Protein != null) yield return new ElementValue("protein", Protein); - if (SourceMaterial != null) yield return new ElementValue("sourceMaterial", SourceMaterial); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3223,7 +2873,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3290,7 +2940,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs index a9a18ea8c4..a09eab3d7a 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SupplyDelivery.cs @@ -206,29 +206,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -244,7 +222,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -260,7 +238,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -528,47 +506,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (Type != null) yield return Type; - if (SuppliedItem != null) yield return SuppliedItem; - if (Occurrence != null) yield return Occurrence; - if (Supplier != null) yield return Supplier; - if (Destination != null) yield return Destination; - foreach (var elem in Receiver) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Type != null) yield return new ElementValue("type", Type); - if (SuppliedItem != null) yield return new ElementValue("suppliedItem", SuppliedItem); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (Supplier != null) yield return new ElementValue("supplier", Supplier); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Receiver) { if (elem != null) yield return new ElementValue("receiver", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -611,7 +549,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -654,7 +592,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs index 3d17f8933b..ec97b769dd 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/SupplyRequest.cs @@ -201,29 +201,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -239,7 +217,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -255,7 +233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -631,55 +609,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Category != null) yield return Category; - if (PriorityElement != null) yield return PriorityElement; - if (Item != null) yield return Item; - if (Quantity != null) yield return Quantity; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - foreach (var elem in Supplier) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (DeliverFrom != null) yield return DeliverFrom; - if (DeliverTo != null) yield return DeliverTo; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Category != null) yield return new ElementValue("category", Category); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Item != null) yield return new ElementValue("item", Item); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in Supplier) { if (elem != null) yield return new ElementValue("supplier", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (DeliverFrom != null) yield return new ElementValue("deliverFrom", DeliverFrom); - if (DeliverTo != null) yield return new ElementValue("deliverTo", DeliverTo); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -734,7 +664,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -789,7 +719,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Task.cs b/src/Hl7.Fhir.R4/Model/Generated/Task.cs index 19545db700..5861ada659 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Task.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Task.cs @@ -326,31 +326,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RepetitionsElement != null) yield return RepetitionsElement; - if (Period != null) yield return Period; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RepetitionsElement != null) yield return new ElementValue("repetitions", RepetitionsElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +345,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -388,7 +364,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RepetitionsElement is not null) yield return new KeyValuePair("repetitions",RepetitionsElement); @@ -490,29 +466,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -528,7 +482,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -544,7 +498,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -645,29 +599,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -683,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -699,7 +631,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1436,87 +1368,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (InstantiatesCanonicalElement != null) yield return InstantiatesCanonicalElement; - if (InstantiatesUriElement != null) yield return InstantiatesUriElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (BusinessStatus != null) yield return BusinessStatus; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Focus != null) yield return Focus; - if (For != null) yield return For; - if (Encounter != null) yield return Encounter; - if (ExecutionPeriod != null) yield return ExecutionPeriod; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (LastModifiedElement != null) yield return LastModifiedElement; - if (Requester != null) yield return Requester; - foreach (var elem in PerformerType) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - if (Location != null) yield return Location; - if (ReasonCode != null) yield return ReasonCode; - if (ReasonReference != null) yield return ReasonReference; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - if (Restriction != null) yield return Restriction; - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (InstantiatesCanonicalElement != null) yield return new ElementValue("instantiatesCanonical", InstantiatesCanonicalElement); - if (InstantiatesUriElement != null) yield return new ElementValue("instantiatesUri", InstantiatesUriElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (BusinessStatus != null) yield return new ElementValue("businessStatus", BusinessStatus); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Focus != null) yield return new ElementValue("focus", Focus); - if (For != null) yield return new ElementValue("for", For); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (ExecutionPeriod != null) yield return new ElementValue("executionPeriod", ExecutionPeriod); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (LastModifiedElement != null) yield return new ElementValue("lastModified", LastModifiedElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in PerformerType) { if (elem != null) yield return new ElementValue("performerType", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - if (Location != null) yield return new ElementValue("location", Location); - if (ReasonCode != null) yield return new ElementValue("reasonCode", ReasonCode); - if (ReasonReference != null) yield return new ElementValue("reasonReference", ReasonReference); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - if (Restriction != null) yield return new ElementValue("restriction", Restriction); - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1619,7 +1471,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1722,7 +1574,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs index e01dfe1684..5405db8e57 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/TerminologyCapabilities.cs @@ -205,29 +205,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -243,7 +221,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -259,7 +237,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -392,29 +370,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -430,7 +386,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -446,7 +402,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -596,31 +552,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UriElement != null) yield return UriElement; - foreach (var elem in Version) { if (elem != null) yield return elem; } - if (SubsumptionElement != null) yield return SubsumptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UriElement != null) yield return new ElementValue("uri", UriElement); - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - if (SubsumptionElement != null) yield return new ElementValue("subsumption", SubsumptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -639,7 +571,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -658,7 +590,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UriElement is not null) yield return new KeyValuePair("uri",UriElement); @@ -913,37 +845,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (IsDefaultElement != null) yield return IsDefaultElement; - if (CompositionalElement != null) yield return CompositionalElement; - foreach (var elem in LanguageElement) { if (elem != null) yield return elem; } - foreach (var elem in Filter) { if (elem != null) yield return elem; } - foreach (var elem in PropertyElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (IsDefaultElement != null) yield return new ElementValue("isDefault", IsDefaultElement); - if (CompositionalElement != null) yield return new ElementValue("compositional", CompositionalElement); - foreach (var elem in LanguageElement) { if (elem != null) yield return new ElementValue("language", elem); } - foreach (var elem in Filter) { if (elem != null) yield return new ElementValue("filter", elem); } - foreach (var elem in PropertyElement) { if (elem != null) yield return new ElementValue("property", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -971,7 +873,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -999,7 +901,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1134,29 +1036,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in OpElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in OpElement) { if (elem != null) yield return new ElementValue("op", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1172,7 +1052,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1188,7 +1068,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1402,35 +1282,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (HierarchicalElement != null) yield return HierarchicalElement; - if (PagingElement != null) yield return PagingElement; - if (IncompleteElement != null) yield return IncompleteElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (TextFilterElement != null) yield return TextFilterElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (HierarchicalElement != null) yield return new ElementValue("hierarchical", HierarchicalElement); - if (PagingElement != null) yield return new ElementValue("paging", PagingElement); - if (IncompleteElement != null) yield return new ElementValue("incomplete", IncompleteElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (TextFilterElement != null) yield return new ElementValue("textFilter", TextFilterElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1455,7 +1307,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1480,7 +1332,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (HierarchicalElement is not null) yield return new KeyValuePair("hierarchical",HierarchicalElement); @@ -1613,29 +1465,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1651,7 +1481,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1667,7 +1497,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1763,27 +1593,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TranslationsElement != null) yield return TranslationsElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TranslationsElement != null) yield return new ElementValue("translations", TranslationsElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1796,7 +1606,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1809,7 +1619,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TranslationsElement is not null) yield return new KeyValuePair("translations",TranslationsElement); @@ -1904,27 +1714,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NeedsMapElement != null) yield return NeedsMapElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NeedsMapElement != null) yield return new ElementValue("needsMap", NeedsMapElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1937,7 +1727,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1950,7 +1740,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NeedsMapElement is not null) yield return new KeyValuePair("needsMap",NeedsMapElement); @@ -2047,27 +1837,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TranslationElement != null) yield return TranslationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TranslationElement != null) yield return new ElementValue("translation", TranslationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2080,7 +1850,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2093,7 +1863,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TranslationElement is not null) yield return new KeyValuePair("translation",TranslationElement); @@ -2790,73 +2560,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (KindElement != null) yield return KindElement; - if (Software != null) yield return Software; - if (Implementation != null) yield return Implementation; - if (LockedDateElement != null) yield return LockedDateElement; - foreach (var elem in CodeSystem) { if (elem != null) yield return elem; } - if (Expansion != null) yield return Expansion; - if (CodeSearchElement != null) yield return CodeSearchElement; - if (ValidateCode != null) yield return ValidateCode; - if (Translation != null) yield return Translation; - if (Closure != null) yield return Closure; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Software != null) yield return new ElementValue("software", Software); - if (Implementation != null) yield return new ElementValue("implementation", Implementation); - if (LockedDateElement != null) yield return new ElementValue("lockedDate", LockedDateElement); - foreach (var elem in CodeSystem) { if (elem != null) yield return new ElementValue("codeSystem", elem); } - if (Expansion != null) yield return new ElementValue("expansion", Expansion); - if (CodeSearchElement != null) yield return new ElementValue("codeSearch", CodeSearchElement); - if (ValidateCode != null) yield return new ElementValue("validateCode", ValidateCode); - if (Translation != null) yield return new ElementValue("translation", Translation); - if (Closure != null) yield return new ElementValue("closure", Closure); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2938,7 +2642,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3020,7 +2724,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs index 691e9e78ea..cab147115d 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/TestReport.cs @@ -353,31 +353,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (UriElement != null) yield return UriElement; - if (DisplayElement != null) yield return DisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -396,7 +372,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -415,7 +391,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -494,27 +470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -527,7 +483,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -540,7 +496,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -636,29 +592,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -674,7 +608,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -690,7 +624,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -859,31 +793,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResultElement != null) yield return ResultElement; - if (MessageElement != null) yield return MessageElement; - if (DetailElement != null) yield return DetailElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -902,7 +812,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -921,7 +831,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResultElement is not null) yield return new KeyValuePair("result",ResultElement); @@ -1091,31 +1001,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResultElement != null) yield return ResultElement; - if (MessageElement != null) yield return MessageElement; - if (DetailElement != null) yield return DetailElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1134,7 +1020,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1153,7 +1039,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResultElement is not null) yield return new KeyValuePair("result",ResultElement); @@ -1300,31 +1186,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1343,7 +1205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1362,7 +1224,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1460,29 +1322,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1498,7 +1338,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1514,7 +1354,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -1595,27 +1435,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1628,7 +1448,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1641,7 +1461,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -1722,27 +1542,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1755,7 +1555,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1768,7 +1568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -2128,49 +1928,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (TestScript != null) yield return TestScript; - if (ResultElement != null) yield return ResultElement; - if (ScoreElement != null) yield return ScoreElement; - if (TesterElement != null) yield return TesterElement; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Setup != null) yield return Setup; - foreach (var elem in Test) { if (elem != null) yield return elem; } - if (Teardown != null) yield return Teardown; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TestScript != null) yield return new ElementValue("testScript", TestScript); - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (ScoreElement != null) yield return new ElementValue("score", ScoreElement); - if (TesterElement != null) yield return new ElementValue("tester", TesterElement); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Setup != null) yield return new ElementValue("setup", Setup); - foreach (var elem in Test) { if (elem != null) yield return new ElementValue("test", elem); } - if (Teardown != null) yield return new ElementValue("teardown", Teardown); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2216,7 +1974,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2262,7 +2020,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs index 5f2099ea3c..283f47bf33 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/TestScript.cs @@ -400,29 +400,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IndexElement != null) yield return IndexElement; - if (Profile != null) yield return Profile; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IndexElement != null) yield return new ElementValue("index", IndexElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -438,7 +416,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -454,7 +432,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IndexElement is not null) yield return new KeyValuePair("index",IndexElement); @@ -572,29 +550,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IndexElement != null) yield return IndexElement; - if (Profile != null) yield return Profile; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IndexElement != null) yield return new ElementValue("index", IndexElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -610,7 +566,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -626,7 +582,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IndexElement is not null) yield return new KeyValuePair("index",IndexElement); @@ -724,29 +680,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Link) { if (elem != null) yield return elem; } - foreach (var elem in Capability) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - foreach (var elem in Capability) { if (elem != null) yield return new ElementValue("capability", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -762,7 +696,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -778,7 +712,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Link?.Any() == true) yield return new KeyValuePair("link",Link); @@ -911,29 +845,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -949,7 +861,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -965,7 +877,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); @@ -1273,39 +1185,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RequiredElement != null) yield return RequiredElement; - if (ValidatedElement != null) yield return ValidatedElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in OriginElement) { if (elem != null) yield return elem; } - if (DestinationElement != null) yield return DestinationElement; - foreach (var elem in LinkElement) { if (elem != null) yield return elem; } - if (CapabilitiesElement != null) yield return CapabilitiesElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (ValidatedElement != null) yield return new ElementValue("validated", ValidatedElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in OriginElement) { if (elem != null) yield return new ElementValue("origin", elem); } - if (DestinationElement != null) yield return new ElementValue("destination", DestinationElement); - foreach (var elem in LinkElement) { if (elem != null) yield return new ElementValue("link", elem); } - if (CapabilitiesElement != null) yield return new ElementValue("capabilities", CapabilitiesElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1336,7 +1216,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1367,7 +1247,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RequiredElement is not null) yield return new KeyValuePair("required",RequiredElement); @@ -1524,31 +1404,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AutocreateElement != null) yield return AutocreateElement; - if (AutodeleteElement != null) yield return AutodeleteElement; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AutocreateElement != null) yield return new ElementValue("autocreate", AutocreateElement); - if (AutodeleteElement != null) yield return new ElementValue("autodelete", AutodeleteElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1567,7 +1423,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1586,7 +1442,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AutocreateElement is not null) yield return new KeyValuePair("autocreate",AutocreateElement); @@ -1925,41 +1781,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DefaultValueElement != null) yield return DefaultValueElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (HeaderFieldElement != null) yield return HeaderFieldElement; - if (HintElement != null) yield return HintElement; - if (PathElement != null) yield return PathElement; - if (SourceIdElement != null) yield return SourceIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DefaultValueElement != null) yield return new ElementValue("defaultValue", DefaultValueElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (HeaderFieldElement != null) yield return new ElementValue("headerField", HeaderFieldElement); - if (HintElement != null) yield return new ElementValue("hint", HintElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1993,7 +1815,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2027,7 +1849,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2111,27 +1933,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2144,7 +1946,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2157,7 +1959,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -2253,29 +2055,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2291,7 +2071,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2307,7 +2087,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -2922,59 +2702,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ResourceElement != null) yield return ResourceElement; - if (LabelElement != null) yield return LabelElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (AcceptElement != null) yield return AcceptElement; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (DestinationElement != null) yield return DestinationElement; - if (EncodeRequestUrlElement != null) yield return EncodeRequestUrlElement; - if (MethodElement != null) yield return MethodElement; - if (OriginElement != null) yield return OriginElement; - if (ParamsElement != null) yield return ParamsElement; - foreach (var elem in RequestHeader) { if (elem != null) yield return elem; } - if (RequestIdElement != null) yield return RequestIdElement; - if (ResponseIdElement != null) yield return ResponseIdElement; - if (SourceIdElement != null) yield return SourceIdElement; - if (TargetIdElement != null) yield return TargetIdElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (AcceptElement != null) yield return new ElementValue("accept", AcceptElement); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (DestinationElement != null) yield return new ElementValue("destination", DestinationElement); - if (EncodeRequestUrlElement != null) yield return new ElementValue("encodeRequestUrl", EncodeRequestUrlElement); - if (MethodElement != null) yield return new ElementValue("method", MethodElement); - if (OriginElement != null) yield return new ElementValue("origin", OriginElement); - if (ParamsElement != null) yield return new ElementValue("params", ParamsElement); - foreach (var elem in RequestHeader) { if (elem != null) yield return new ElementValue("requestHeader", elem); } - if (RequestIdElement != null) yield return new ElementValue("requestId", RequestIdElement); - if (ResponseIdElement != null) yield return new ElementValue("responseId", ResponseIdElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - if (TargetIdElement != null) yield return new ElementValue("targetId", TargetIdElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3035,7 +2763,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3096,7 +2824,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -3246,29 +2974,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FieldElement != null) yield return FieldElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FieldElement != null) yield return new ElementValue("field", FieldElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3284,7 +2990,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3300,7 +3006,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FieldElement is not null) yield return new KeyValuePair("field",FieldElement); @@ -4125,69 +3831,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LabelElement != null) yield return LabelElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (DirectionElement != null) yield return DirectionElement; - if (CompareToSourceIdElement != null) yield return CompareToSourceIdElement; - if (CompareToSourceExpressionElement != null) yield return CompareToSourceExpressionElement; - if (CompareToSourcePathElement != null) yield return CompareToSourcePathElement; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (HeaderFieldElement != null) yield return HeaderFieldElement; - if (MinimumIdElement != null) yield return MinimumIdElement; - if (NavigationLinksElement != null) yield return NavigationLinksElement; - if (OperatorElement != null) yield return OperatorElement; - if (PathElement != null) yield return PathElement; - if (RequestMethodElement != null) yield return RequestMethodElement; - if (RequestURLElement != null) yield return RequestURLElement; - if (ResourceElement != null) yield return ResourceElement; - if (ResponseElement != null) yield return ResponseElement; - if (ResponseCodeElement != null) yield return ResponseCodeElement; - if (SourceIdElement != null) yield return SourceIdElement; - if (ValidateProfileIdElement != null) yield return ValidateProfileIdElement; - if (ValueElement != null) yield return ValueElement; - if (WarningOnlyElement != null) yield return WarningOnlyElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (DirectionElement != null) yield return new ElementValue("direction", DirectionElement); - if (CompareToSourceIdElement != null) yield return new ElementValue("compareToSourceId", CompareToSourceIdElement); - if (CompareToSourceExpressionElement != null) yield return new ElementValue("compareToSourceExpression", CompareToSourceExpressionElement); - if (CompareToSourcePathElement != null) yield return new ElementValue("compareToSourcePath", CompareToSourcePathElement); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (HeaderFieldElement != null) yield return new ElementValue("headerField", HeaderFieldElement); - if (MinimumIdElement != null) yield return new ElementValue("minimumId", MinimumIdElement); - if (NavigationLinksElement != null) yield return new ElementValue("navigationLinks", NavigationLinksElement); - if (OperatorElement != null) yield return new ElementValue("operator", OperatorElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (RequestMethodElement != null) yield return new ElementValue("requestMethod", RequestMethodElement); - if (RequestURLElement != null) yield return new ElementValue("requestURL", RequestURLElement); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (ResponseElement != null) yield return new ElementValue("response", ResponseElement); - if (ResponseCodeElement != null) yield return new ElementValue("responseCode", ResponseCodeElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - if (ValidateProfileIdElement != null) yield return new ElementValue("validateProfileId", ValidateProfileIdElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (WarningOnlyElement != null) yield return new ElementValue("warningOnly", WarningOnlyElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4263,7 +3907,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4339,7 +3983,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LabelElement is not null) yield return new KeyValuePair("label",LabelElement); @@ -4505,31 +4149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4548,7 +4168,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4567,7 +4187,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -4665,29 +4285,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4703,7 +4301,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4719,7 +4317,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -4800,27 +4398,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4833,7 +4411,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4846,7 +4424,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -4927,27 +4505,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4960,7 +4518,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4973,7 +4531,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -5621,73 +5179,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in Origin) { if (elem != null) yield return elem; } - foreach (var elem in Destination) { if (elem != null) yield return elem; } - if (Metadata != null) yield return Metadata; - foreach (var elem in Fixture) { if (elem != null) yield return elem; } - foreach (var elem in Profile) { if (elem != null) yield return elem; } - foreach (var elem in Variable) { if (elem != null) yield return elem; } - if (Setup != null) yield return Setup; - foreach (var elem in Test) { if (elem != null) yield return elem; } - if (Teardown != null) yield return Teardown; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in Origin) { if (elem != null) yield return new ElementValue("origin", elem); } - foreach (var elem in Destination) { if (elem != null) yield return new ElementValue("destination", elem); } - if (Metadata != null) yield return new ElementValue("metadata", Metadata); - foreach (var elem in Fixture) { if (elem != null) yield return new ElementValue("fixture", elem); } - foreach (var elem in Profile) { if (elem != null) yield return new ElementValue("profile", elem); } - foreach (var elem in Variable) { if (elem != null) yield return new ElementValue("variable", elem); } - if (Setup != null) yield return new ElementValue("setup", Setup); - foreach (var elem in Test) { if (elem != null) yield return new ElementValue("test", elem); } - if (Teardown != null) yield return new ElementValue("teardown", Teardown); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5769,7 +5261,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5851,7 +5343,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/Timing.cs b/src/Hl7.Fhir.R4/Model/Generated/Timing.cs index ee955366b1..d6221627a3 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/Timing.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/Timing.cs @@ -843,55 +843,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Bounds != null) yield return Bounds; - if (CountElement != null) yield return CountElement; - if (CountMaxElement != null) yield return CountMaxElement; - if (DurationElement != null) yield return DurationElement; - if (DurationMaxElement != null) yield return DurationMaxElement; - if (DurationUnitElement != null) yield return DurationUnitElement; - if (FrequencyElement != null) yield return FrequencyElement; - if (FrequencyMaxElement != null) yield return FrequencyMaxElement; - if (PeriodElement != null) yield return PeriodElement; - if (PeriodMaxElement != null) yield return PeriodMaxElement; - if (PeriodUnitElement != null) yield return PeriodUnitElement; - foreach (var elem in DayOfWeekElement) { if (elem != null) yield return elem; } - foreach (var elem in TimeOfDayElement) { if (elem != null) yield return elem; } - foreach (var elem in WhenElement) { if (elem != null) yield return elem; } - if (OffsetElement != null) yield return OffsetElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Bounds != null) yield return new ElementValue("bounds", Bounds); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (CountMaxElement != null) yield return new ElementValue("countMax", CountMaxElement); - if (DurationElement != null) yield return new ElementValue("duration", DurationElement); - if (DurationMaxElement != null) yield return new ElementValue("durationMax", DurationMaxElement); - if (DurationUnitElement != null) yield return new ElementValue("durationUnit", DurationUnitElement); - if (FrequencyElement != null) yield return new ElementValue("frequency", FrequencyElement); - if (FrequencyMaxElement != null) yield return new ElementValue("frequencyMax", FrequencyMaxElement); - if (PeriodElement != null) yield return new ElementValue("period", PeriodElement); - if (PeriodMaxElement != null) yield return new ElementValue("periodMax", PeriodMaxElement); - if (PeriodUnitElement != null) yield return new ElementValue("periodUnit", PeriodUnitElement); - foreach (var elem in DayOfWeekElement) { if (elem != null) yield return new ElementValue("dayOfWeek", elem); } - foreach (var elem in TimeOfDayElement) { if (elem != null) yield return new ElementValue("timeOfDay", elem); } - foreach (var elem in WhenElement) { if (elem != null) yield return new ElementValue("when", elem); } - if (OffsetElement != null) yield return new ElementValue("offset", OffsetElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -946,7 +898,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1001,7 +953,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Bounds is not null) yield return new KeyValuePair("bounds",Bounds); @@ -1130,31 +1082,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in EventElement) { if (elem != null) yield return elem; } - if (Repeat != null) yield return Repeat; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in EventElement) { if (elem != null) yield return new ElementValue("event", elem); } - if (Repeat != null) yield return new ElementValue("repeat", Repeat); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1173,7 +1101,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1192,7 +1120,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (EventElement?.Any() == true) yield return new KeyValuePair("event",EventElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/TriggerDefinition.cs b/src/Hl7.Fhir.R4/Model/Generated/TriggerDefinition.cs index 70fcd1c866..0d7dec5758 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/TriggerDefinition.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/TriggerDefinition.cs @@ -280,35 +280,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - if (Timing != null) yield return Timing; - foreach (var elem in Data) { if (elem != null) yield return elem; } - if (Condition != null) yield return Condition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - foreach (var elem in Data) { if (elem != null) yield return new ElementValue("data", elem); } - if (Condition != null) yield return new ElementValue("condition", Condition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -333,7 +305,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -358,7 +330,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs index 3877b1b1bc..7040a9fb8d 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/VerificationResult.cs @@ -294,39 +294,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Who != null) yield return Who; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in CommunicationMethod) { if (elem != null) yield return elem; } - if (ValidationStatus != null) yield return ValidationStatus; - if (ValidationDateElement != null) yield return ValidationDateElement; - if (CanPushUpdates != null) yield return CanPushUpdates; - foreach (var elem in PushTypeAvailable) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Who != null) yield return new ElementValue("who", Who); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in CommunicationMethod) { if (elem != null) yield return new ElementValue("communicationMethod", elem); } - if (ValidationStatus != null) yield return new ElementValue("validationStatus", ValidationStatus); - if (ValidationDateElement != null) yield return new ElementValue("validationDate", ValidationDateElement); - if (CanPushUpdates != null) yield return new ElementValue("canPushUpdates", CanPushUpdates); - foreach (var elem in PushTypeAvailable) { if (elem != null) yield return new ElementValue("pushTypeAvailable", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -357,7 +325,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -388,7 +356,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Who is not null) yield return new KeyValuePair("who",Who); @@ -641,41 +609,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Who != null) yield return Who; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (CommunicationMethod != null) yield return CommunicationMethod; - if (DateElement != null) yield return DateElement; - if (SourceIdentityCertificateElement != null) yield return SourceIdentityCertificateElement; - if (ProxyIdentityCertificateElement != null) yield return ProxyIdentityCertificateElement; - if (ProxySignature != null) yield return ProxySignature; - if (SourceSignature != null) yield return SourceSignature; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Who != null) yield return new ElementValue("who", Who); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (CommunicationMethod != null) yield return new ElementValue("communicationMethod", CommunicationMethod); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (SourceIdentityCertificateElement != null) yield return new ElementValue("sourceIdentityCertificate", SourceIdentityCertificateElement); - if (ProxyIdentityCertificateElement != null) yield return new ElementValue("proxyIdentityCertificate", ProxyIdentityCertificateElement); - if (ProxySignature != null) yield return new ElementValue("proxySignature", ProxySignature); - if (SourceSignature != null) yield return new ElementValue("sourceSignature", SourceSignature); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -709,7 +643,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -743,7 +677,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Who is not null) yield return new KeyValuePair("who",Who); @@ -879,31 +813,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Organization != null) yield return Organization; - if (IdentityCertificateElement != null) yield return IdentityCertificateElement; - if (AttestationSignature != null) yield return AttestationSignature; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Organization != null) yield return new ElementValue("organization", Organization); - if (IdentityCertificateElement != null) yield return new ElementValue("identityCertificate", IdentityCertificateElement); - if (AttestationSignature != null) yield return new ElementValue("attestationSignature", AttestationSignature); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -922,7 +832,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -941,7 +851,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Organization is not null) yield return new KeyValuePair("organization",Organization); @@ -1318,53 +1228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Target) { if (elem != null) yield return elem; } - foreach (var elem in TargetLocationElement) { if (elem != null) yield return elem; } - if (Need != null) yield return Need; - if (StatusElement != null) yield return StatusElement; - if (StatusDateElement != null) yield return StatusDateElement; - if (ValidationType != null) yield return ValidationType; - foreach (var elem in ValidationProcess) { if (elem != null) yield return elem; } - if (Frequency != null) yield return Frequency; - if (LastPerformedElement != null) yield return LastPerformedElement; - if (NextScheduledElement != null) yield return NextScheduledElement; - if (FailureAction != null) yield return FailureAction; - foreach (var elem in PrimarySource) { if (elem != null) yield return elem; } - if (Attestation != null) yield return Attestation; - foreach (var elem in Validator) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - foreach (var elem in TargetLocationElement) { if (elem != null) yield return new ElementValue("targetLocation", elem); } - if (Need != null) yield return new ElementValue("need", Need); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (ValidationType != null) yield return new ElementValue("validationType", ValidationType); - foreach (var elem in ValidationProcess) { if (elem != null) yield return new ElementValue("validationProcess", elem); } - if (Frequency != null) yield return new ElementValue("frequency", Frequency); - if (LastPerformedElement != null) yield return new ElementValue("lastPerformed", LastPerformedElement); - if (NextScheduledElement != null) yield return new ElementValue("nextScheduled", NextScheduledElement); - if (FailureAction != null) yield return new ElementValue("failureAction", FailureAction); - foreach (var elem in PrimarySource) { if (elem != null) yield return new ElementValue("primarySource", elem); } - if (Attestation != null) yield return new ElementValue("attestation", Attestation); - foreach (var elem in Validator) { if (elem != null) yield return new ElementValue("validator", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1416,7 +1280,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1468,7 +1332,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target?.Any() == true) yield return new KeyValuePair("target",Target); diff --git a/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs index cfe4a5cee9..32842a0a96 100644 --- a/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs +++ b/src/Hl7.Fhir.R4/Model/Generated/VisionPrescription.cs @@ -581,53 +581,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Product != null) yield return Product; - if (EyeElement != null) yield return EyeElement; - if (SphereElement != null) yield return SphereElement; - if (CylinderElement != null) yield return CylinderElement; - if (AxisElement != null) yield return AxisElement; - foreach (var elem in Prism) { if (elem != null) yield return elem; } - if (AddElement != null) yield return AddElement; - if (PowerElement != null) yield return PowerElement; - if (BackCurveElement != null) yield return BackCurveElement; - if (DiameterElement != null) yield return DiameterElement; - if (Duration != null) yield return Duration; - if (ColorElement != null) yield return ColorElement; - if (BrandElement != null) yield return BrandElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Product != null) yield return new ElementValue("product", Product); - if (EyeElement != null) yield return new ElementValue("eye", EyeElement); - if (SphereElement != null) yield return new ElementValue("sphere", SphereElement); - if (CylinderElement != null) yield return new ElementValue("cylinder", CylinderElement); - if (AxisElement != null) yield return new ElementValue("axis", AxisElement); - foreach (var elem in Prism) { if (elem != null) yield return new ElementValue("prism", elem); } - if (AddElement != null) yield return new ElementValue("add", AddElement); - if (PowerElement != null) yield return new ElementValue("power", PowerElement); - if (BackCurveElement != null) yield return new ElementValue("backCurve", BackCurveElement); - if (DiameterElement != null) yield return new ElementValue("diameter", DiameterElement); - if (Duration != null) yield return new ElementValue("duration", Duration); - if (ColorElement != null) yield return new ElementValue("color", ColorElement); - if (BrandElement != null) yield return new ElementValue("brand", BrandElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -679,7 +633,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -731,7 +685,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Product is not null) yield return new KeyValuePair("product",Product); @@ -879,29 +833,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AmountElement != null) yield return AmountElement; - if (BaseElement != null) yield return BaseElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AmountElement != null) yield return new ElementValue("amount", AmountElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -917,7 +849,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -933,7 +865,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AmountElement is not null) yield return new KeyValuePair("amount",AmountElement); @@ -1180,41 +1112,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CreatedElement != null) yield return CreatedElement; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (DateWrittenElement != null) yield return DateWrittenElement; - if (Prescriber != null) yield return Prescriber; - foreach (var elem in LensSpecification) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateWrittenElement != null) yield return new ElementValue("dateWritten", DateWrittenElement); - if (Prescriber != null) yield return new ElementValue("prescriber", Prescriber); - foreach (var elem in LensSpecification) { if (elem != null) yield return new ElementValue("lensSpecification", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1248,7 +1146,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1282,7 +1180,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Account.cs b/src/Hl7.Fhir.R4B/Model/Generated/Account.cs index 2f910665a1..cd163c34cf 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Account.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Account.cs @@ -209,29 +209,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Coverage != null) yield return Coverage; - if (PriorityElement != null) yield return PriorityElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -247,7 +225,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -263,7 +241,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coverage is not null) yield return new KeyValuePair("coverage",Coverage); @@ -396,31 +374,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Party != null) yield return Party; - if (OnHoldElement != null) yield return OnHoldElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Party != null) yield return new ElementValue("party", Party); - if (OnHoldElement != null) yield return new ElementValue("onHold", OnHoldElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -458,7 +412,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Party is not null) yield return new KeyValuePair("party",Party); @@ -753,47 +707,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (NameElement != null) yield return NameElement; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (ServicePeriod != null) yield return ServicePeriod; - foreach (var elem in Coverage) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Guarantor) { if (elem != null) yield return elem; } - if (PartOf != null) yield return PartOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (ServicePeriod != null) yield return new ElementValue("servicePeriod", ServicePeriod); - foreach (var elem in Coverage) { if (elem != null) yield return new ElementValue("coverage", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Guarantor) { if (elem != null) yield return new ElementValue("guarantor", elem); } - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -836,7 +750,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -879,7 +793,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs index c0c177dca0..7035a65b6c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ActivityDefinition.cs @@ -268,29 +268,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -306,7 +284,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -322,7 +300,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -439,29 +417,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -477,7 +433,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -493,7 +449,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -1724,117 +1680,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (KindElement != null) yield return KindElement; - if (ProfileElement != null) yield return ProfileElement; - if (Code != null) yield return Code; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Timing != null) yield return Timing; - if (Location != null) yield return Location; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Product != null) yield return Product; - if (Quantity != null) yield return Quantity; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in SpecimenRequirement) { if (elem != null) yield return elem; } - foreach (var elem in ObservationRequirement) { if (elem != null) yield return elem; } - foreach (var elem in ObservationResultRequirement) { if (elem != null) yield return elem; } - if (TransformElement != null) yield return TransformElement; - foreach (var elem in DynamicValue) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - if (Code != null) yield return new ElementValue("code", Code); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Product != null) yield return new ElementValue("product", Product); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in SpecimenRequirement) { if (elem != null) yield return new ElementValue("specimenRequirement", elem); } - foreach (var elem in ObservationRequirement) { if (elem != null) yield return new ElementValue("observationRequirement", elem); } - foreach (var elem in ObservationResultRequirement) { if (elem != null) yield return new ElementValue("observationResultRequirement", elem); } - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in DynamicValue) { if (elem != null) yield return new ElementValue("dynamicValue", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1982,7 +1828,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2130,7 +1976,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Address.cs b/src/Hl7.Fhir.R4B/Model/Generated/Address.cs index 92c31a3108..88f5824f9d 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Address.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Address.cs @@ -494,45 +494,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in LineElement) { if (elem != null) yield return elem; } - if (CityElement != null) yield return CityElement; - if (DistrictElement != null) yield return DistrictElement; - if (StateElement != null) yield return StateElement; - if (PostalCodeElement != null) yield return PostalCodeElement; - if (CountryElement != null) yield return CountryElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LineElement) { if (elem != null) yield return new ElementValue("line", elem); } - if (CityElement != null) yield return new ElementValue("city", CityElement); - if (DistrictElement != null) yield return new ElementValue("district", DistrictElement); - if (StateElement != null) yield return new ElementValue("state", StateElement); - if (PostalCodeElement != null) yield return new ElementValue("postalCode", PostalCodeElement); - if (CountryElement != null) yield return new ElementValue("country", CountryElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -572,7 +534,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -612,7 +574,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs index c94b95fbdb..1186ceac5a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AdministrableProductDefinition.cs @@ -164,31 +164,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - if (Status != null) yield return Status; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - if (Status != null) yield return new ElementValue("status", Status); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -207,7 +183,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -226,7 +202,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -406,39 +382,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (FirstDose != null) yield return FirstDose; - if (MaxSingleDose != null) yield return MaxSingleDose; - if (MaxDosePerDay != null) yield return MaxDosePerDay; - if (MaxDosePerTreatmentPeriod != null) yield return MaxDosePerTreatmentPeriod; - if (MaxTreatmentPeriod != null) yield return MaxTreatmentPeriod; - foreach (var elem in TargetSpecies) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (FirstDose != null) yield return new ElementValue("firstDose", FirstDose); - if (MaxSingleDose != null) yield return new ElementValue("maxSingleDose", MaxSingleDose); - if (MaxDosePerDay != null) yield return new ElementValue("maxDosePerDay", MaxDosePerDay); - if (MaxDosePerTreatmentPeriod != null) yield return new ElementValue("maxDosePerTreatmentPeriod", MaxDosePerTreatmentPeriod); - if (MaxTreatmentPeriod != null) yield return new ElementValue("maxTreatmentPeriod", MaxTreatmentPeriod); - foreach (var elem in TargetSpecies) { if (elem != null) yield return new ElementValue("targetSpecies", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -469,7 +413,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -500,7 +444,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -601,29 +545,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in WithdrawalPeriod) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in WithdrawalPeriod) { if (elem != null) yield return new ElementValue("withdrawalPeriod", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -639,7 +561,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -655,7 +577,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -785,31 +707,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Tissue != null) yield return Tissue; - if (Value != null) yield return Value; - if (SupportingInformationElement != null) yield return SupportingInformationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Tissue != null) yield return new ElementValue("tissue", Tissue); - if (Value != null) yield return new ElementValue("value", Value); - if (SupportingInformationElement != null) yield return new ElementValue("supportingInformation", SupportingInformationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -828,7 +726,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -847,7 +745,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Tissue is not null) yield return new KeyValuePair("tissue",Tissue); @@ -1094,45 +992,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in FormOf) { if (elem != null) yield return elem; } - if (AdministrableDoseForm != null) yield return AdministrableDoseForm; - if (UnitOfPresentation != null) yield return UnitOfPresentation; - foreach (var elem in ProducedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - if (Device != null) yield return Device; - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in RouteOfAdministration) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in FormOf) { if (elem != null) yield return new ElementValue("formOf", elem); } - if (AdministrableDoseForm != null) yield return new ElementValue("administrableDoseForm", AdministrableDoseForm); - if (UnitOfPresentation != null) yield return new ElementValue("unitOfPresentation", UnitOfPresentation); - foreach (var elem in ProducedFrom) { if (elem != null) yield return new ElementValue("producedFrom", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in RouteOfAdministration) { if (elem != null) yield return new ElementValue("routeOfAdministration", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1172,7 +1032,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1212,7 +1072,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs index 0d92d79fe2..ae4c75e483 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AdverseEvent.cs @@ -246,29 +246,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Instance != null) yield return Instance; - foreach (var elem in Causality) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Instance != null) yield return new ElementValue("instance", Instance); - foreach (var elem in Causality) { if (elem != null) yield return new ElementValue("causality", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -284,7 +262,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -300,7 +278,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Instance is not null) yield return new KeyValuePair("instance",Instance); @@ -447,33 +425,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Assessment != null) yield return Assessment; - if (ProductRelatednessElement != null) yield return ProductRelatednessElement; - if (Author != null) yield return Author; - if (Method != null) yield return Method; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Assessment != null) yield return new ElementValue("assessment", Assessment); - if (ProductRelatednessElement != null) yield return new ElementValue("productRelatedness", ProductRelatednessElement); - if (Author != null) yield return new ElementValue("author", Author); - if (Method != null) yield return new ElementValue("method", Method); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -495,7 +447,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -517,7 +469,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Assessment is not null) yield return new KeyValuePair("assessment",Assessment); @@ -995,65 +947,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (ActualityElement != null) yield return ActualityElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Event != null) yield return Event; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - if (DetectedElement != null) yield return DetectedElement; - if (RecordedDateElement != null) yield return RecordedDateElement; - foreach (var elem in ResultingCondition) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (Seriousness != null) yield return Seriousness; - if (Severity != null) yield return Severity; - if (Outcome != null) yield return Outcome; - if (Recorder != null) yield return Recorder; - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in SuspectEntity) { if (elem != null) yield return elem; } - foreach (var elem in SubjectMedicalHistory) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceDocument) { if (elem != null) yield return elem; } - foreach (var elem in Study) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (ActualityElement != null) yield return new ElementValue("actuality", ActualityElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Event != null) yield return new ElementValue("event", Event); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (DetectedElement != null) yield return new ElementValue("detected", DetectedElement); - if (RecordedDateElement != null) yield return new ElementValue("recordedDate", RecordedDateElement); - foreach (var elem in ResultingCondition) { if (elem != null) yield return new ElementValue("resultingCondition", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (Seriousness != null) yield return new ElementValue("seriousness", Seriousness); - if (Severity != null) yield return new ElementValue("severity", Severity); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in SuspectEntity) { if (elem != null) yield return new ElementValue("suspectEntity", elem); } - foreach (var elem in SubjectMedicalHistory) { if (elem != null) yield return new ElementValue("subjectMedicalHistory", elem); } - foreach (var elem in ReferenceDocument) { if (elem != null) yield return new ElementValue("referenceDocument", elem); } - foreach (var elem in Study) { if (elem != null) yield return new ElementValue("study", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1123,7 +1017,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1193,7 +1087,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs index 9101184ee0..dc2019bb71 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AllergyIntolerance.cs @@ -462,39 +462,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - foreach (var elem in Manifestation) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (OnsetElement != null) yield return OnsetElement; - if (SeverityElement != null) yield return SeverityElement; - if (ExposureRoute != null) yield return ExposureRoute; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - foreach (var elem in Manifestation) { if (elem != null) yield return new ElementValue("manifestation", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (OnsetElement != null) yield return new ElementValue("onset", OnsetElement); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (ExposureRoute != null) yield return new ElementValue("exposureRoute", ExposureRoute); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -525,7 +493,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -556,7 +524,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -981,57 +949,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ClinicalStatus != null) yield return ClinicalStatus; - if (VerificationStatus != null) yield return VerificationStatus; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in CategoryElement) { if (elem != null) yield return elem; } - if (CriticalityElement != null) yield return CriticalityElement; - if (Code != null) yield return Code; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (Onset != null) yield return Onset; - if (RecordedDateElement != null) yield return RecordedDateElement; - if (Recorder != null) yield return Recorder; - if (Asserter != null) yield return Asserter; - if (LastOccurrenceElement != null) yield return LastOccurrenceElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Reaction) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ClinicalStatus != null) yield return new ElementValue("clinicalStatus", ClinicalStatus); - if (VerificationStatus != null) yield return new ElementValue("verificationStatus", VerificationStatus); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in CategoryElement) { if (elem != null) yield return new ElementValue("category", elem); } - if (CriticalityElement != null) yield return new ElementValue("criticality", CriticalityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Onset != null) yield return new ElementValue("onset", Onset); - if (RecordedDateElement != null) yield return new ElementValue("recordedDate", RecordedDateElement); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - if (Asserter != null) yield return new ElementValue("asserter", Asserter); - if (LastOccurrenceElement != null) yield return new ElementValue("lastOccurrence", LastOccurrenceElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Reaction) { if (elem != null) yield return new ElementValue("reaction", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1089,7 +1007,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1147,7 +1065,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Annotation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Annotation.cs index 3dc188b365..a3dc0299ee 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Annotation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Annotation.cs @@ -187,31 +187,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Author != null) yield return Author; - if (TimeElement != null) yield return TimeElement; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Author != null) yield return new ElementValue("author", Author); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -230,7 +206,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -249,7 +225,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Author is not null) yield return new KeyValuePair("author",Author); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs index 88a798c191..722f411f5a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Appointment.cs @@ -334,35 +334,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Actor != null) yield return Actor; - if (RequiredElement != null) yield return RequiredElement; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Actor != null) yield return new ElementValue("actor", Actor); - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -387,7 +359,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -412,7 +384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -1007,69 +979,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CancelationReason != null) yield return CancelationReason; - foreach (var elem in ServiceCategory) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - if (AppointmentType != null) yield return AppointmentType; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (MinutesDurationElement != null) yield return MinutesDurationElement; - foreach (var elem in Slot) { if (elem != null) yield return elem; } - if (CreatedElement != null) yield return CreatedElement; - if (CommentElement != null) yield return CommentElement; - if (PatientInstructionElement != null) yield return PatientInstructionElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in RequestedPeriod) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CancelationReason != null) yield return new ElementValue("cancelationReason", CancelationReason); - foreach (var elem in ServiceCategory) { if (elem != null) yield return new ElementValue("serviceCategory", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - if (AppointmentType != null) yield return new ElementValue("appointmentType", AppointmentType); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (MinutesDurationElement != null) yield return new ElementValue("minutesDuration", MinutesDurationElement); - foreach (var elem in Slot) { if (elem != null) yield return new ElementValue("slot", elem); } - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (PatientInstructionElement != null) yield return new ElementValue("patientInstruction", PatientInstructionElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in RequestedPeriod) { if (elem != null) yield return new ElementValue("requestedPeriod", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1145,7 +1055,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1221,7 +1131,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs index 41fb0ea65a..43484b5107 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AppointmentResponse.cs @@ -308,41 +308,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Appointment != null) yield return Appointment; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - foreach (var elem in ParticipantType) { if (elem != null) yield return elem; } - if (Actor != null) yield return Actor; - if (ParticipantStatusElement != null) yield return ParticipantStatusElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Appointment != null) yield return new ElementValue("appointment", Appointment); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - foreach (var elem in ParticipantType) { if (elem != null) yield return new ElementValue("participantType", elem); } - if (Actor != null) yield return new ElementValue("actor", Actor); - if (ParticipantStatusElement != null) yield return new ElementValue("participantStatus", ParticipantStatusElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -376,7 +342,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -410,7 +376,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs index 9e447529ce..f0072d17f1 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/AuditEvent.cs @@ -491,47 +491,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Who != null) yield return Who; - if (AltIdElement != null) yield return AltIdElement; - if (NameElement != null) yield return NameElement; - if (RequestorElement != null) yield return RequestorElement; - if (Location != null) yield return Location; - foreach (var elem in PolicyElement) { if (elem != null) yield return elem; } - if (Media != null) yield return Media; - if (Network != null) yield return Network; - foreach (var elem in PurposeOfUse) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Who != null) yield return new ElementValue("who", Who); - if (AltIdElement != null) yield return new ElementValue("altId", AltIdElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (RequestorElement != null) yield return new ElementValue("requestor", RequestorElement); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in PolicyElement) { if (elem != null) yield return new ElementValue("policy", elem); } - if (Media != null) yield return new ElementValue("media", Media); - if (Network != null) yield return new ElementValue("network", Network); - foreach (var elem in PurposeOfUse) { if (elem != null) yield return new ElementValue("purposeOfUse", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -574,7 +534,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -617,7 +577,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -760,29 +720,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AddressElement != null) yield return AddressElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AddressElement != null) yield return new ElementValue("address", AddressElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -798,7 +736,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -814,7 +752,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AddressElement is not null) yield return new KeyValuePair("address",AddressElement); @@ -950,31 +888,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SiteElement != null) yield return SiteElement; - if (Observer != null) yield return Observer; - foreach (var elem in Type) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SiteElement != null) yield return new ElementValue("site", SiteElement); - if (Observer != null) yield return new ElementValue("observer", Observer); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -993,7 +907,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1012,7 +926,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SiteElement is not null) yield return new KeyValuePair("site",SiteElement); @@ -1284,43 +1198,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (What != null) yield return What; - if (Type != null) yield return Type; - if (Role != null) yield return Role; - if (Lifecycle != null) yield return Lifecycle; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (QueryElement != null) yield return QueryElement; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (What != null) yield return new ElementValue("what", What); - if (Type != null) yield return new ElementValue("type", Type); - if (Role != null) yield return new ElementValue("role", Role); - if (Lifecycle != null) yield return new ElementValue("lifecycle", Lifecycle); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (QueryElement != null) yield return new ElementValue("query", QueryElement); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1357,7 +1235,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1394,7 +1272,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (What is not null) yield return new KeyValuePair("what",What); @@ -1519,29 +1397,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1557,7 +1413,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1573,7 +1429,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1883,47 +1739,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Subtype) { if (elem != null) yield return elem; } - if (ActionElement != null) yield return ActionElement; - if (Period != null) yield return Period; - if (RecordedElement != null) yield return RecordedElement; - if (OutcomeElement != null) yield return OutcomeElement; - if (OutcomeDescElement != null) yield return OutcomeDescElement; - foreach (var elem in PurposeOfEvent) { if (elem != null) yield return elem; } - foreach (var elem in Agent) { if (elem != null) yield return elem; } - if (Source != null) yield return Source; - foreach (var elem in Entity) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Subtype) { if (elem != null) yield return new ElementValue("subtype", elem); } - if (ActionElement != null) yield return new ElementValue("action", ActionElement); - if (Period != null) yield return new ElementValue("period", Period); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (OutcomeDescElement != null) yield return new ElementValue("outcomeDesc", OutcomeDescElement); - foreach (var elem in PurposeOfEvent) { if (elem != null) yield return new ElementValue("purposeOfEvent", elem); } - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Entity) { if (elem != null) yield return new ElementValue("entity", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1966,7 +1782,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2009,7 +1825,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs b/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs index 9f20602b74..a11b5003f0 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Basic.cs @@ -205,35 +205,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (CreatedElement != null) yield return CreatedElement; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -258,7 +230,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +255,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs index 4f2c5e3b19..7f64f03307 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/BiologicallyDerivedProduct.cs @@ -257,31 +257,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Collector != null) yield return Collector; - if (Source != null) yield return Source; - if (Collected != null) yield return Collected; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Collector != null) yield return new ElementValue("collector", Collector); - if (Source != null) yield return new ElementValue("source", Source); - if (Collected != null) yield return new ElementValue("collected", Collected); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -300,7 +276,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -319,7 +295,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Collector is not null) yield return new KeyValuePair("collector",Collector); @@ -471,33 +447,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Procedure != null) yield return Procedure; - if (Additive != null) yield return Additive; - if (Time != null) yield return Time; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - if (Additive != null) yield return new ElementValue("additive", Additive); - if (Time != null) yield return new ElementValue("time", Time); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -519,7 +469,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -541,7 +491,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -659,29 +609,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Time != null) yield return Time; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Time != null) yield return new ElementValue("time", Time); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -697,7 +625,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -713,7 +641,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -894,33 +822,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (TemperatureElement != null) yield return TemperatureElement; - if (ScaleElement != null) yield return ScaleElement; - if (Duration != null) yield return Duration; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TemperatureElement != null) yield return new ElementValue("temperature", TemperatureElement); - if (ScaleElement != null) yield return new ElementValue("scale", ScaleElement); - if (Duration != null) yield return new ElementValue("duration", Duration); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -942,7 +844,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -964,7 +866,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1260,47 +1162,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ProductCategoryElement != null) yield return ProductCategoryElement; - if (ProductCode != null) yield return ProductCode; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Request) { if (elem != null) yield return elem; } - if (QuantityElement != null) yield return QuantityElement; - foreach (var elem in Parent) { if (elem != null) yield return elem; } - if (Collection != null) yield return Collection; - foreach (var elem in Processing) { if (elem != null) yield return elem; } - if (Manipulation != null) yield return Manipulation; - foreach (var elem in Storage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ProductCategoryElement != null) yield return new ElementValue("productCategory", ProductCategoryElement); - if (ProductCode != null) yield return new ElementValue("productCode", ProductCode); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - if (QuantityElement != null) yield return new ElementValue("quantity", QuantityElement); - foreach (var elem in Parent) { if (elem != null) yield return new ElementValue("parent", elem); } - if (Collection != null) yield return new ElementValue("collection", Collection); - foreach (var elem in Processing) { if (elem != null) yield return new ElementValue("processing", elem); } - if (Manipulation != null) yield return new ElementValue("manipulation", Manipulation); - foreach (var elem in Storage) { if (elem != null) yield return new ElementValue("storage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1343,7 +1205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1386,7 +1248,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs index 5ddf0fe79c..28b4eb02bb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/BodyStructure.cs @@ -273,41 +273,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Morphology != null) yield return Morphology; - if (Location != null) yield return Location; - foreach (var elem in LocationQualifier) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Image) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Morphology != null) yield return new ElementValue("morphology", Morphology); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in LocationQualifier) { if (elem != null) yield return new ElementValue("locationQualifier", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Image) { if (elem != null) yield return new ElementValue("image", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -341,7 +307,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -375,7 +341,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs index d87ca2efa9..7645a33a50 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CarePlan.cs @@ -358,35 +358,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in OutcomeCodeableConcept) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeReference) { if (elem != null) yield return elem; } - foreach (var elem in Progress) { if (elem != null) yield return elem; } - if (Reference != null) yield return Reference; - if (Detail != null) yield return Detail; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in OutcomeCodeableConcept) { if (elem != null) yield return new ElementValue("outcomeCodeableConcept", elem); } - foreach (var elem in OutcomeReference) { if (elem != null) yield return new ElementValue("outcomeReference", elem); } - foreach (var elem in Progress) { if (elem != null) yield return new ElementValue("progress", elem); } - if (Reference != null) yield return new ElementValue("reference", Reference); - if (Detail != null) yield return new ElementValue("detail", Detail); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -411,7 +383,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -436,7 +408,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (OutcomeCodeableConcept?.Any() == true) yield return new KeyValuePair("outcomeCodeableConcept",OutcomeCodeableConcept); @@ -910,59 +882,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Scheduled != null) yield return Scheduled; - if (Location != null) yield return Location; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Product != null) yield return Product; - if (DailyAmount != null) yield return DailyAmount; - if (Quantity != null) yield return Quantity; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Scheduled != null) yield return new ElementValue("scheduled", Scheduled); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Product != null) yield return new ElementValue("product", Product); - if (DailyAmount != null) yield return new ElementValue("dailyAmount", DailyAmount); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1023,7 +943,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1084,7 +1004,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -1687,71 +1607,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Period != null) yield return Period; - if (CreatedElement != null) yield return CreatedElement; - if (Author != null) yield return Author; - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Activity) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Period != null) yield return new ElementValue("period", Period); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Activity) { if (elem != null) yield return new ElementValue("activity", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1830,7 +1686,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1909,7 +1765,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs index 3e41dbd231..02e6aa4dc9 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CareTeam.cs @@ -224,33 +224,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Member != null) yield return Member; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Member != null) yield return new ElementValue("member", Member); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -272,7 +246,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -294,7 +268,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role?.Any() == true) yield return new KeyValuePair("role",Role); @@ -610,51 +584,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Period != null) yield return Period; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in ManagingOrganization) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in ManagingOrganization) { if (elem != null) yield return new ElementValue("managingOrganization", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -703,7 +633,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -752,7 +682,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs b/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs index 5a1e9a73ba..72b13d13ba 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CatalogEntry.cs @@ -192,29 +192,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RelationtypeElement != null) yield return RelationtypeElement; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RelationtypeElement != null) yield return new ElementValue("relationtype", RelationtypeElement); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -230,7 +208,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -246,7 +224,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RelationtypeElement is not null) yield return new KeyValuePair("relationtype",RelationtypeElement); @@ -588,51 +566,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (OrderableElement != null) yield return OrderableElement; - if (ReferencedItem != null) yield return ReferencedItem; - foreach (var elem in AdditionalIdentifier) { if (elem != null) yield return elem; } - foreach (var elem in Classification) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ValidityPeriod != null) yield return ValidityPeriod; - if (ValidToElement != null) yield return ValidToElement; - if (LastUpdatedElement != null) yield return LastUpdatedElement; - foreach (var elem in AdditionalCharacteristic) { if (elem != null) yield return elem; } - foreach (var elem in AdditionalClassification) { if (elem != null) yield return elem; } - foreach (var elem in RelatedEntry) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (OrderableElement != null) yield return new ElementValue("orderable", OrderableElement); - if (ReferencedItem != null) yield return new ElementValue("referencedItem", ReferencedItem); - foreach (var elem in AdditionalIdentifier) { if (elem != null) yield return new ElementValue("additionalIdentifier", elem); } - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - if (ValidToElement != null) yield return new ElementValue("validTo", ValidToElement); - if (LastUpdatedElement != null) yield return new ElementValue("lastUpdated", LastUpdatedElement); - foreach (var elem in AdditionalCharacteristic) { if (elem != null) yield return new ElementValue("additionalCharacteristic", elem); } - foreach (var elem in AdditionalClassification) { if (elem != null) yield return new ElementValue("additionalClassification", elem); } - foreach (var elem in RelatedEntry) { if (elem != null) yield return new ElementValue("relatedEntry", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -681,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -730,7 +664,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs index d614aed190..7a11b6ce53 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItem.cs @@ -202,29 +202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -240,7 +218,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -256,7 +234,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -875,77 +853,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in DefinitionUriElement) { if (elem != null) yield return elem; } - foreach (var elem in DefinitionCanonicalElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Occurrence != null) yield return Occurrence; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (PerformingOrganization != null) yield return PerformingOrganization; - if (RequestingOrganization != null) yield return RequestingOrganization; - if (CostCenter != null) yield return CostCenter; - if (Quantity != null) yield return Quantity; - foreach (var elem in Bodysite) { if (elem != null) yield return elem; } - if (FactorOverrideElement != null) yield return FactorOverrideElement; - if (PriceOverride != null) yield return PriceOverride; - if (OverrideReasonElement != null) yield return OverrideReasonElement; - if (Enterer != null) yield return Enterer; - if (EnteredDateElement != null) yield return EnteredDateElement; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Service) { if (elem != null) yield return elem; } - if (Product != null) yield return Product; - foreach (var elem in Account) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in DefinitionUriElement) { if (elem != null) yield return new ElementValue("definitionUri", elem); } - foreach (var elem in DefinitionCanonicalElement) { if (elem != null) yield return new ElementValue("definitionCanonical", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (PerformingOrganization != null) yield return new ElementValue("performingOrganization", PerformingOrganization); - if (RequestingOrganization != null) yield return new ElementValue("requestingOrganization", RequestingOrganization); - if (CostCenter != null) yield return new ElementValue("costCenter", CostCenter); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Bodysite) { if (elem != null) yield return new ElementValue("bodysite", elem); } - if (FactorOverrideElement != null) yield return new ElementValue("factorOverride", FactorOverrideElement); - if (PriceOverride != null) yield return new ElementValue("priceOverride", PriceOverride); - if (OverrideReasonElement != null) yield return new ElementValue("overrideReason", OverrideReasonElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (EnteredDateElement != null) yield return new ElementValue("enteredDate", EnteredDateElement); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Service) { if (elem != null) yield return new ElementValue("service", elem); } - if (Product != null) yield return new ElementValue("product", Product); - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1033,7 +941,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1121,7 +1029,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs index 998752fe74..6e19bf6bcb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ChargeItemDefinition.cs @@ -217,31 +217,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (LanguageElement != null) yield return LanguageElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -260,7 +236,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -279,7 +255,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -378,29 +354,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Applicability) { if (elem != null) yield return elem; } - foreach (var elem in PriceComponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Applicability) { if (elem != null) yield return new ElementValue("applicability", elem); } - foreach (var elem in PriceComponent) { if (elem != null) yield return new ElementValue("priceComponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -416,7 +370,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -432,7 +386,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Applicability?.Any() == true) yield return new KeyValuePair("applicability",Applicability); @@ -599,33 +553,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Code != null) yield return Code; - if (FactorElement != null) yield return FactorElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Code != null) yield return new ElementValue("code", Code); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -647,7 +575,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -669,7 +597,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1359,71 +1287,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return elem; } - foreach (var elem in PartOfElement) { if (elem != null) yield return elem; } - foreach (var elem in ReplacesElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - if (Code != null) yield return Code; - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Applicability) { if (elem != null) yield return elem; } - foreach (var elem in PropertyGroup) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return new ElementValue("derivedFromUri", elem); } - foreach (var elem in PartOfElement) { if (elem != null) yield return new ElementValue("partOf", elem); } - foreach (var elem in ReplacesElement) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Applicability) { if (elem != null) yield return new ElementValue("applicability", elem); } - foreach (var elem in PropertyGroup) { if (elem != null) yield return new ElementValue("propertyGroup", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1502,7 +1366,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1581,7 +1445,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs index ee6f2ab871..068d6e66fe 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Citation.cs @@ -163,29 +163,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Style != null) yield return Style; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Style != null) yield return new ElementValue("style", Style); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -201,7 +179,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -217,7 +195,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Style is not null) yield return new KeyValuePair("style",Style); @@ -313,29 +291,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -351,7 +307,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -367,7 +323,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -497,31 +453,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Activity != null) yield return Activity; - if (ActualElement != null) yield return ActualElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Activity != null) yield return new ElementValue("activity", Activity); - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -540,7 +472,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -559,7 +491,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Activity is not null) yield return new KeyValuePair("activity",Activity); @@ -677,31 +609,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RelationshipType != null) yield return RelationshipType; - foreach (var elem in TargetClassifier) { if (elem != null) yield return elem; } - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RelationshipType != null) yield return new ElementValue("relationshipType", RelationshipType); - foreach (var elem in TargetClassifier) { if (elem != null) yield return new ElementValue("targetClassifier", elem); } - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -720,7 +628,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -739,7 +647,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RelationshipType is not null) yield return new KeyValuePair("relationshipType",RelationshipType); @@ -1071,55 +979,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in RelatedIdentifier) { if (elem != null) yield return elem; } - if (DateAccessedElement != null) yield return DateAccessedElement; - if (Version != null) yield return Version; - foreach (var elem in CurrentState) { if (elem != null) yield return elem; } - foreach (var elem in StatusDate) { if (elem != null) yield return elem; } - foreach (var elem in Title) { if (elem != null) yield return elem; } - foreach (var elem in Abstract) { if (elem != null) yield return elem; } - if (Part != null) yield return Part; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - foreach (var elem in PublicationForm) { if (elem != null) yield return elem; } - foreach (var elem in WebLocation) { if (elem != null) yield return elem; } - foreach (var elem in Classification) { if (elem != null) yield return elem; } - if (Contributorship != null) yield return Contributorship; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in RelatedIdentifier) { if (elem != null) yield return new ElementValue("relatedIdentifier", elem); } - if (DateAccessedElement != null) yield return new ElementValue("dateAccessed", DateAccessedElement); - if (Version != null) yield return new ElementValue("version", Version); - foreach (var elem in CurrentState) { if (elem != null) yield return new ElementValue("currentState", elem); } - foreach (var elem in StatusDate) { if (elem != null) yield return new ElementValue("statusDate", elem); } - foreach (var elem in Title) { if (elem != null) yield return new ElementValue("title", elem); } - foreach (var elem in Abstract) { if (elem != null) yield return new ElementValue("abstract", elem); } - if (Part != null) yield return new ElementValue("part", Part); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - foreach (var elem in PublicationForm) { if (elem != null) yield return new ElementValue("publicationForm", elem); } - foreach (var elem in WebLocation) { if (elem != null) yield return new ElementValue("webLocation", elem); } - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - if (Contributorship != null) yield return new ElementValue("contributorship", Contributorship); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1174,7 +1034,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1229,7 +1089,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1356,29 +1216,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ValueElement != null) yield return ValueElement; - if (BaseCitation != null) yield return BaseCitation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (BaseCitation != null) yield return new ElementValue("baseCitation", BaseCitation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1394,7 +1232,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1410,7 +1248,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ValueElement is not null) yield return new KeyValuePair("value",ValueElement); @@ -1540,31 +1378,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Activity != null) yield return Activity; - if (ActualElement != null) yield return ActualElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Activity != null) yield return new ElementValue("activity", Activity); - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1583,7 +1397,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1602,7 +1416,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Activity is not null) yield return new KeyValuePair("activity",Activity); @@ -1734,31 +1548,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Language != null) yield return Language; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Language != null) yield return new ElementValue("language", Language); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1777,7 +1567,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1796,7 +1586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -1961,33 +1751,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Language != null) yield return Language; - if (TextElement != null) yield return TextElement; - if (CopyrightElement != null) yield return CopyrightElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Language != null) yield return new ElementValue("language", Language); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2009,7 +1773,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2031,7 +1795,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2163,31 +1927,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ValueElement != null) yield return ValueElement; - if (BaseCitation != null) yield return BaseCitation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (BaseCitation != null) yield return new ElementValue("baseCitation", BaseCitation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2206,7 +1946,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2225,7 +1965,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2343,31 +2083,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RelationshipType != null) yield return RelationshipType; - foreach (var elem in TargetClassifier) { if (elem != null) yield return elem; } - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RelationshipType != null) yield return new ElementValue("relationshipType", RelationshipType); - foreach (var elem in TargetClassifier) { if (elem != null) yield return new ElementValue("targetClassifier", elem); } - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2386,7 +2102,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2405,7 +2121,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RelationshipType is not null) yield return new KeyValuePair("relationshipType",RelationshipType); @@ -2792,47 +2508,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PublishedIn != null) yield return PublishedIn; - if (PeriodicRelease != null) yield return PeriodicRelease; - if (ArticleDateElement != null) yield return ArticleDateElement; - if (LastRevisionDateElement != null) yield return LastRevisionDateElement; - foreach (var elem in Language) { if (elem != null) yield return elem; } - if (AccessionNumberElement != null) yield return AccessionNumberElement; - if (PageStringElement != null) yield return PageStringElement; - if (FirstPageElement != null) yield return FirstPageElement; - if (LastPageElement != null) yield return LastPageElement; - if (PageCountElement != null) yield return PageCountElement; - if (CopyrightElement != null) yield return CopyrightElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PublishedIn != null) yield return new ElementValue("publishedIn", PublishedIn); - if (PeriodicRelease != null) yield return new ElementValue("periodicRelease", PeriodicRelease); - if (ArticleDateElement != null) yield return new ElementValue("articleDate", ArticleDateElement); - if (LastRevisionDateElement != null) yield return new ElementValue("lastRevisionDate", LastRevisionDateElement); - foreach (var elem in Language) { if (elem != null) yield return new ElementValue("language", elem); } - if (AccessionNumberElement != null) yield return new ElementValue("accessionNumber", AccessionNumberElement); - if (PageStringElement != null) yield return new ElementValue("pageString", PageStringElement); - if (FirstPageElement != null) yield return new ElementValue("firstPage", FirstPageElement); - if (LastPageElement != null) yield return new ElementValue("lastPage", LastPageElement); - if (PageCountElement != null) yield return new ElementValue("pageCount", PageCountElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2875,7 +2551,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2918,7 +2594,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PublishedIn is not null) yield return new KeyValuePair("publishedIn",PublishedIn); @@ -3108,35 +2784,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (Publisher != null) yield return Publisher; - if (PublisherLocationElement != null) yield return PublisherLocationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Publisher != null) yield return new ElementValue("publisher", Publisher); - if (PublisherLocationElement != null) yield return new ElementValue("publisherLocation", PublisherLocationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3161,7 +2809,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3186,7 +2834,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -3351,33 +2999,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CitedMedium != null) yield return CitedMedium; - if (VolumeElement != null) yield return VolumeElement; - if (IssueElement != null) yield return IssueElement; - if (DateOfPublication != null) yield return DateOfPublication; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CitedMedium != null) yield return new ElementValue("citedMedium", CitedMedium); - if (VolumeElement != null) yield return new ElementValue("volume", VolumeElement); - if (IssueElement != null) yield return new ElementValue("issue", IssueElement); - if (DateOfPublication != null) yield return new ElementValue("dateOfPublication", DateOfPublication); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3399,7 +3021,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3421,7 +3043,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CitedMedium is not null) yield return new KeyValuePair("citedMedium",CitedMedium); @@ -3688,37 +3310,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (YearElement != null) yield return YearElement; - if (MonthElement != null) yield return MonthElement; - if (DayElement != null) yield return DayElement; - if (SeasonElement != null) yield return SeasonElement; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (YearElement != null) yield return new ElementValue("year", YearElement); - if (MonthElement != null) yield return new ElementValue("month", MonthElement); - if (DayElement != null) yield return new ElementValue("day", DayElement); - if (SeasonElement != null) yield return new ElementValue("season", SeasonElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3746,7 +3338,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3774,7 +3366,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -3890,29 +3482,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3928,7 +3498,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3944,7 +3514,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -4056,31 +3626,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - if (WhoClassified != null) yield return WhoClassified; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - if (WhoClassified != null) yield return new ElementValue("whoClassified", WhoClassified); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4099,7 +3645,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4118,7 +3664,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -4302,35 +3848,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Person != null) yield return Person; - if (Organization != null) yield return Organization; - if (Publisher != null) yield return Publisher; - if (ClassifierCopyrightElement != null) yield return ClassifierCopyrightElement; - if (FreeToShareElement != null) yield return FreeToShareElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Person != null) yield return new ElementValue("person", Person); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Publisher != null) yield return new ElementValue("publisher", Publisher); - if (ClassifierCopyrightElement != null) yield return new ElementValue("classifierCopyright", ClassifierCopyrightElement); - if (FreeToShareElement != null) yield return new ElementValue("freeToShare", FreeToShareElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4355,7 +3873,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4380,7 +3898,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Person is not null) yield return new KeyValuePair("person",Person); @@ -4515,31 +4033,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CompleteElement != null) yield return CompleteElement; - foreach (var elem in Entry) { if (elem != null) yield return elem; } - foreach (var elem in Summary) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CompleteElement != null) yield return new ElementValue("complete", CompleteElement); - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - foreach (var elem in Summary) { if (elem != null) yield return new ElementValue("summary", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4558,7 +4052,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4577,7 +4071,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CompleteElement is not null) yield return new KeyValuePair("complete",CompleteElement); @@ -4915,49 +4409,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Name != null) yield return Name; - if (InitialsElement != null) yield return InitialsElement; - if (CollectiveNameElement != null) yield return CollectiveNameElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in AffiliationInfo) { if (elem != null) yield return elem; } - foreach (var elem in Address) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in ContributionType) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - foreach (var elem in ContributionInstance) { if (elem != null) yield return elem; } - if (CorrespondingContactElement != null) yield return CorrespondingContactElement; - if (ListOrderElement != null) yield return ListOrderElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Name != null) yield return new ElementValue("name", Name); - if (InitialsElement != null) yield return new ElementValue("initials", InitialsElement); - if (CollectiveNameElement != null) yield return new ElementValue("collectiveName", CollectiveNameElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in AffiliationInfo) { if (elem != null) yield return new ElementValue("affiliationInfo", elem); } - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in ContributionType) { if (elem != null) yield return new ElementValue("contributionType", elem); } - if (Role != null) yield return new ElementValue("role", Role); - foreach (var elem in ContributionInstance) { if (elem != null) yield return new ElementValue("contributionInstance", elem); } - if (CorrespondingContactElement != null) yield return new ElementValue("correspondingContact", CorrespondingContactElement); - if (ListOrderElement != null) yield return new ElementValue("listOrder", ListOrderElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5003,7 +4455,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5049,7 +4501,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Name is not null) yield return new KeyValuePair("name",Name); @@ -5208,31 +4660,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AffiliationElement != null) yield return AffiliationElement; - if (RoleElement != null) yield return RoleElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AffiliationElement != null) yield return new ElementValue("affiliation", AffiliationElement); - if (RoleElement != null) yield return new ElementValue("role", RoleElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5251,7 +4679,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5270,7 +4698,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AffiliationElement is not null) yield return new KeyValuePair("affiliation",AffiliationElement); @@ -5384,29 +4812,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (TimeElement != null) yield return TimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5422,7 +4828,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5438,7 +4844,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -5585,33 +4991,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Style != null) yield return Style; - if (Source != null) yield return Source; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Style != null) yield return new ElementValue("style", Style); - if (Source != null) yield return new ElementValue("source", Source); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5633,7 +5013,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5655,7 +5035,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -6424,83 +5804,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in Summary) { if (elem != null) yield return elem; } - foreach (var elem in Classification) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in CurrentState) { if (elem != null) yield return elem; } - foreach (var elem in StatusDate) { if (elem != null) yield return elem; } - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - if (CitedArtifact != null) yield return CitedArtifact; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in Summary) { if (elem != null) yield return new ElementValue("summary", elem); } - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in CurrentState) { if (elem != null) yield return new ElementValue("currentState", elem); } - foreach (var elem in StatusDate) { if (elem != null) yield return new ElementValue("statusDate", elem); } - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - if (CitedArtifact != null) yield return new ElementValue("citedArtifact", CitedArtifact); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6597,7 +5901,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6694,7 +5998,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs b/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs index fcd001b867..cece820a23 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Claim.cs @@ -167,31 +167,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Claim != null) yield return Claim; - if (Relationship != null) yield return Relationship; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Claim != null) yield return new ElementValue("claim", Claim); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -229,7 +205,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Claim is not null) yield return new KeyValuePair("claim",Claim); @@ -331,29 +307,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -385,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -571,35 +525,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Provider != null) yield return Provider; - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Role != null) yield return Role; - if (Qualification != null) yield return Qualification; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Role != null) yield return new ElementValue("role", Role); - if (Qualification != null) yield return new ElementValue("qualification", Qualification); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -624,7 +550,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -649,7 +575,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -841,37 +767,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Timing != null) yield return Timing; - if (Value != null) yield return Value; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Value != null) yield return new ElementValue("value", Value); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -899,7 +795,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -927,7 +823,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1103,35 +999,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Diagnosis != null) yield return Diagnosis; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (OnAdmission != null) yield return OnAdmission; - if (PackageCode != null) yield return PackageCode; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (OnAdmission != null) yield return new ElementValue("onAdmission", OnAdmission); - if (PackageCode != null) yield return new ElementValue("packageCode", PackageCode); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1156,7 +1024,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1181,7 +1049,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1375,35 +1243,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (Procedure != null) yield return Procedure; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1428,7 +1268,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1453,7 +1293,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1713,39 +1553,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (FocalElement != null) yield return FocalElement; - if (Identifier != null) yield return Identifier; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - if (ClaimResponse != null) yield return ClaimResponse; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1776,7 +1584,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1807,7 +1615,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1947,31 +1755,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Type != null) yield return Type; - if (Location != null) yield return Location; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Location != null) yield return new ElementValue("location", Location); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1990,7 +1774,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2009,7 +1793,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -2547,67 +2331,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return new ElementValue("careTeamSequence", elem); } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return new ElementValue("diagnosisSequence", elem); } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return new ElementValue("procedureSequence", elem); } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return new ElementValue("informationSequence", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2680,7 +2404,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2753,7 +2477,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3077,49 +2801,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3165,7 +2847,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3211,7 +2893,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3509,47 +3191,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3592,7 +3234,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3635,7 +3277,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4219,79 +3861,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (BillablePeriod != null) yield return BillablePeriod; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Priority != null) yield return Priority; - if (FundsReserve != null) yield return FundsReserve; - foreach (var elem in Related) { if (elem != null) yield return elem; } - if (Prescription != null) yield return Prescription; - if (OriginalPrescription != null) yield return OriginalPrescription; - if (Payee != null) yield return Payee; - if (Referral != null) yield return Referral; - if (Facility != null) yield return Facility; - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (Accident != null) yield return Accident; - foreach (var elem in Item) { if (elem != null) yield return elem; } - if (Total != null) yield return Total; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (BillablePeriod != null) yield return new ElementValue("billablePeriod", BillablePeriod); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - if (Prescription != null) yield return new ElementValue("prescription", Prescription); - if (OriginalPrescription != null) yield return new ElementValue("originalPrescription", OriginalPrescription); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Referral != null) yield return new ElementValue("referral", Referral); - if (Facility != null) yield return new ElementValue("facility", Facility); - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (Accident != null) yield return new ElementValue("accident", Accident); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - if (Total != null) yield return new ElementValue("total", Total); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4382,7 +3952,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4473,7 +4043,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs index 87b7b2b4aa..6e821d2a1a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ClaimResponse.cs @@ -218,33 +218,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ItemSequenceElement != null) yield return ItemSequenceElement; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ItemSequenceElement != null) yield return new ElementValue("itemSequence", ItemSequenceElement); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -266,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -288,7 +262,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement is not null) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -439,33 +413,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Reason != null) yield return Reason; - if (Amount != null) yield return Amount; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -487,7 +435,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -509,7 +457,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -679,33 +627,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DetailSequenceElement != null) yield return DetailSequenceElement; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DetailSequenceElement != null) yield return new ElementValue("detailSequence", DetailSequenceElement); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -727,7 +649,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -749,7 +671,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DetailSequenceElement is not null) yield return new KeyValuePair("detailSequence",DetailSequenceElement); @@ -902,31 +824,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SubDetailSequenceElement != null) yield return SubDetailSequenceElement; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SubDetailSequenceElement != null) yield return new ElementValue("subDetailSequence", SubDetailSequenceElement); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -945,7 +843,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -964,7 +862,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SubDetailSequenceElement is not null) yield return new KeyValuePair("subDetailSequence",SubDetailSequenceElement); @@ -1431,61 +1329,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in SubdetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in Provider) { if (elem != null) yield return elem; } - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return new ElementValue("itemSequence", elem); } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return new ElementValue("detailSequence", elem); } - foreach (var elem in SubdetailSequenceElement) { if (elem != null) yield return new ElementValue("subdetailSequence", elem); } - foreach (var elem in Provider) { if (elem != null) yield return new ElementValue("provider", elem); } - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1549,7 +1393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1613,7 +1457,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement?.Any() == true) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -1880,43 +1724,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1953,7 +1761,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1990,7 +1798,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductOrService is not null) yield return new KeyValuePair("productOrService",ProductOrService); @@ -2231,41 +2039,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2299,7 +2073,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2333,7 +2107,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductOrService is not null) yield return new KeyValuePair("productOrService",ProductOrService); @@ -2439,29 +2213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2477,7 +2229,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2493,7 +2245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -2675,37 +2427,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Adjustment != null) yield return Adjustment; - if (AdjustmentReason != null) yield return AdjustmentReason; - if (DateElement != null) yield return DateElement; - if (Amount != null) yield return Amount; - if (Identifier != null) yield return Identifier; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Adjustment != null) yield return new ElementValue("adjustment", Adjustment); - if (AdjustmentReason != null) yield return new ElementValue("adjustmentReason", AdjustmentReason); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2733,7 +2455,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2761,7 +2483,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2951,33 +2673,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2999,7 +2695,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3021,7 +2717,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -3229,35 +2925,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - if (ClaimResponse != null) yield return ClaimResponse; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3282,7 +2950,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3307,7 +2975,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3495,33 +3163,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ItemSequenceElement != null) yield return ItemSequenceElement; - if (DetailSequenceElement != null) yield return DetailSequenceElement; - if (SubDetailSequenceElement != null) yield return SubDetailSequenceElement; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ItemSequenceElement != null) yield return new ElementValue("itemSequence", ItemSequenceElement); - if (DetailSequenceElement != null) yield return new ElementValue("detailSequence", DetailSequenceElement); - if (SubDetailSequenceElement != null) yield return new ElementValue("subDetailSequence", SubDetailSequenceElement); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3543,7 +3185,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3565,7 +3207,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement is not null) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -4194,79 +3836,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (CreatedElement != null) yield return CreatedElement; - if (Insurer != null) yield return Insurer; - if (Requestor != null) yield return Requestor; - if (Request != null) yield return Request; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (PreAuthRefElement != null) yield return PreAuthRefElement; - if (PreAuthPeriod != null) yield return PreAuthPeriod; - if (PayeeType != null) yield return PayeeType; - foreach (var elem in Item) { if (elem != null) yield return elem; } - foreach (var elem in AddItem) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Total) { if (elem != null) yield return elem; } - if (Payment != null) yield return Payment; - if (FundsReserve != null) yield return FundsReserve; - if (FormCode != null) yield return FormCode; - if (Form != null) yield return Form; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Error) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Requestor != null) yield return new ElementValue("requestor", Requestor); - if (Request != null) yield return new ElementValue("request", Request); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (PreAuthRefElement != null) yield return new ElementValue("preAuthRef", PreAuthRefElement); - if (PreAuthPeriod != null) yield return new ElementValue("preAuthPeriod", PreAuthPeriod); - if (PayeeType != null) yield return new ElementValue("payeeType", PayeeType); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - foreach (var elem in AddItem) { if (elem != null) yield return new ElementValue("addItem", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Total) { if (elem != null) yield return new ElementValue("total", elem); } - if (Payment != null) yield return new ElementValue("payment", Payment); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - if (FormCode != null) yield return new ElementValue("formCode", FormCode); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return new ElementValue("communicationRequest", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4357,7 +3927,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4448,7 +4018,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs index b48746d632..42f9e23dfc 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalImpression.cs @@ -179,29 +179,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -217,7 +195,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -233,7 +211,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -366,31 +344,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ItemCodeableConcept != null) yield return ItemCodeableConcept; - if (ItemReference != null) yield return ItemReference; - if (BasisElement != null) yield return BasisElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ItemCodeableConcept != null) yield return new ElementValue("itemCodeableConcept", ItemCodeableConcept); - if (ItemReference != null) yield return new ElementValue("itemReference", ItemReference); - if (BasisElement != null) yield return new ElementValue("basis", BasisElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -409,7 +363,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -428,7 +382,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemCodeableConcept is not null) yield return new KeyValuePair("itemCodeableConcept",ItemCodeableConcept); @@ -921,65 +875,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (DateElement != null) yield return DateElement; - if (Assessor != null) yield return Assessor; - if (Previous != null) yield return Previous; - foreach (var elem in Problem) { if (elem != null) yield return elem; } - foreach (var elem in Investigation) { if (elem != null) yield return elem; } - foreach (var elem in ProtocolElement) { if (elem != null) yield return elem; } - if (SummaryElement != null) yield return SummaryElement; - foreach (var elem in Finding) { if (elem != null) yield return elem; } - foreach (var elem in PrognosisCodeableConcept) { if (elem != null) yield return elem; } - foreach (var elem in PrognosisReference) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Assessor != null) yield return new ElementValue("assessor", Assessor); - if (Previous != null) yield return new ElementValue("previous", Previous); - foreach (var elem in Problem) { if (elem != null) yield return new ElementValue("problem", elem); } - foreach (var elem in Investigation) { if (elem != null) yield return new ElementValue("investigation", elem); } - foreach (var elem in ProtocolElement) { if (elem != null) yield return new ElementValue("protocol", elem); } - if (SummaryElement != null) yield return new ElementValue("summary", SummaryElement); - foreach (var elem in Finding) { if (elem != null) yield return new ElementValue("finding", elem); } - foreach (var elem in PrognosisCodeableConcept) { if (elem != null) yield return new ElementValue("prognosisCodeableConcept", elem); } - foreach (var elem in PrognosisReference) { if (elem != null) yield return new ElementValue("prognosisReference", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1049,7 +945,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1119,7 +1015,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs index 809a3a0cd5..d50ad50881 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ClinicalUseDefinition.cs @@ -236,35 +236,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DiseaseSymptomProcedure != null) yield return DiseaseSymptomProcedure; - if (DiseaseStatus != null) yield return DiseaseStatus; - foreach (var elem in Comorbidity) { if (elem != null) yield return elem; } - foreach (var elem in Indication) { if (elem != null) yield return elem; } - foreach (var elem in OtherTherapy) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DiseaseSymptomProcedure != null) yield return new ElementValue("diseaseSymptomProcedure", DiseaseSymptomProcedure); - if (DiseaseStatus != null) yield return new ElementValue("diseaseStatus", DiseaseStatus); - foreach (var elem in Comorbidity) { if (elem != null) yield return new ElementValue("comorbidity", elem); } - foreach (var elem in Indication) { if (elem != null) yield return new ElementValue("indication", elem); } - foreach (var elem in OtherTherapy) { if (elem != null) yield return new ElementValue("otherTherapy", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -289,7 +261,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -314,7 +286,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DiseaseSymptomProcedure is not null) yield return new KeyValuePair("diseaseSymptomProcedure",DiseaseSymptomProcedure); @@ -417,29 +389,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RelationshipType != null) yield return RelationshipType; - if (Therapy != null) yield return Therapy; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RelationshipType != null) yield return new ElementValue("relationshipType", RelationshipType); - if (Therapy != null) yield return new ElementValue("therapy", Therapy); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -455,7 +405,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -471,7 +421,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RelationshipType is not null) yield return new KeyValuePair("relationshipType",RelationshipType); @@ -655,39 +605,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DiseaseSymptomProcedure != null) yield return DiseaseSymptomProcedure; - if (DiseaseStatus != null) yield return DiseaseStatus; - foreach (var elem in Comorbidity) { if (elem != null) yield return elem; } - if (IntendedEffect != null) yield return IntendedEffect; - if (Duration != null) yield return Duration; - foreach (var elem in UndesirableEffect) { if (elem != null) yield return elem; } - foreach (var elem in OtherTherapy) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DiseaseSymptomProcedure != null) yield return new ElementValue("diseaseSymptomProcedure", DiseaseSymptomProcedure); - if (DiseaseStatus != null) yield return new ElementValue("diseaseStatus", DiseaseStatus); - foreach (var elem in Comorbidity) { if (elem != null) yield return new ElementValue("comorbidity", elem); } - if (IntendedEffect != null) yield return new ElementValue("intendedEffect", IntendedEffect); - if (Duration != null) yield return new ElementValue("duration", Duration); - foreach (var elem in UndesirableEffect) { if (elem != null) yield return new ElementValue("undesirableEffect", elem); } - foreach (var elem in OtherTherapy) { if (elem != null) yield return new ElementValue("otherTherapy", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -718,7 +636,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -749,7 +667,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DiseaseSymptomProcedure is not null) yield return new KeyValuePair("diseaseSymptomProcedure",DiseaseSymptomProcedure); @@ -901,35 +819,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Interactant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Effect != null) yield return Effect; - if (Incidence != null) yield return Incidence; - foreach (var elem in Management) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Interactant) { if (elem != null) yield return new ElementValue("interactant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Effect != null) yield return new ElementValue("effect", Effect); - if (Incidence != null) yield return new ElementValue("incidence", Incidence); - foreach (var elem in Management) { if (elem != null) yield return new ElementValue("management", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -954,7 +844,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -979,7 +869,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Interactant?.Any() == true) yield return new KeyValuePair("interactant",Interactant); @@ -1064,27 +954,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1097,7 +967,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1110,7 +980,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -1224,31 +1094,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SymptomConditionEffect != null) yield return SymptomConditionEffect; - if (Classification != null) yield return Classification; - if (FrequencyOfOccurrence != null) yield return FrequencyOfOccurrence; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SymptomConditionEffect != null) yield return new ElementValue("symptomConditionEffect", SymptomConditionEffect); - if (Classification != null) yield return new ElementValue("classification", Classification); - if (FrequencyOfOccurrence != null) yield return new ElementValue("frequencyOfOccurrence", FrequencyOfOccurrence); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1267,7 +1113,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1286,7 +1132,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SymptomConditionEffect is not null) yield return new KeyValuePair("symptomConditionEffect",SymptomConditionEffect); @@ -1402,29 +1248,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1440,7 +1264,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1456,7 +1280,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1713,47 +1537,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (Contraindication != null) yield return Contraindication; - if (Indication != null) yield return Indication; - if (Interaction != null) yield return Interaction; - foreach (var elem in Population) { if (elem != null) yield return elem; } - if (UndesirableEffect != null) yield return UndesirableEffect; - if (Warning != null) yield return Warning; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (Contraindication != null) yield return new ElementValue("contraindication", Contraindication); - if (Indication != null) yield return new ElementValue("indication", Indication); - if (Interaction != null) yield return new ElementValue("interaction", Interaction); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - if (UndesirableEffect != null) yield return new ElementValue("undesirableEffect", UndesirableEffect); - if (Warning != null) yield return new ElementValue("warning", Warning); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1796,7 +1580,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1839,7 +1623,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs b/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs index 2b8004a2fc..e9b76d665f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Communication.cs @@ -134,27 +134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -167,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -180,7 +160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -747,71 +727,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - foreach (var elem in InResponseTo) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in Medium) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Topic != null) yield return Topic; - foreach (var elem in About) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - if (SentElement != null) yield return SentElement; - if (ReceivedElement != null) yield return ReceivedElement; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - if (Sender != null) yield return Sender; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Payload) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - foreach (var elem in InResponseTo) { if (elem != null) yield return new ElementValue("inResponseTo", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in Medium) { if (elem != null) yield return new ElementValue("medium", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Topic != null) yield return new ElementValue("topic", Topic); - foreach (var elem in About) { if (elem != null) yield return new ElementValue("about", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (SentElement != null) yield return new ElementValue("sent", SentElement); - if (ReceivedElement != null) yield return new ElementValue("received", ReceivedElement); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - if (Sender != null) yield return new ElementValue("sender", Sender); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Payload) { if (elem != null) yield return new ElementValue("payload", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -890,7 +806,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -969,7 +885,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs index bc3686b6e6..7f2291a883 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CommunicationRequest.cs @@ -134,27 +134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -167,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -180,7 +160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -693,69 +673,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - foreach (var elem in Medium) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in About) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - foreach (var elem in Payload) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - if (Sender != null) yield return Sender; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - foreach (var elem in Medium) { if (elem != null) yield return new ElementValue("medium", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in About) { if (elem != null) yield return new ElementValue("about", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in Payload) { if (elem != null) yield return new ElementValue("payload", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - if (Sender != null) yield return new ElementValue("sender", Sender); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -831,7 +749,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -907,7 +825,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs index 081839e377..2c058e78f8 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CompartmentDefinition.cs @@ -221,31 +221,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in ParamElement) { if (elem != null) yield return elem; } - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in ParamElement) { if (elem != null) yield return new ElementValue("param", elem); } - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -264,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +259,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -766,53 +742,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CodeElement != null) yield return CodeElement; - if (SearchElement != null) yield return SearchElement; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (SearchElement != null) yield return new ElementValue("search", SearchElement); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -864,7 +794,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -916,7 +846,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs b/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs index b0f1beaa53..a6c699363e 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Composition.cs @@ -285,31 +285,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (TimeElement != null) yield return TimeElement; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -328,7 +304,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -347,7 +323,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -470,29 +446,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -508,7 +462,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -524,7 +478,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -642,31 +596,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -685,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -704,7 +634,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -979,45 +909,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Code != null) yield return Code; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Focus != null) yield return Focus; - if (Text != null) yield return Text; - if (ModeElement != null) yield return ModeElement; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in Entry) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Focus != null) yield return new ElementValue("focus", Focus); - if (Text != null) yield return new ElementValue("text", Text); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1057,7 +949,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1097,7 +989,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1491,55 +1383,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (ConfidentialityElement != null) yield return ConfidentialityElement; - foreach (var elem in Attester) { if (elem != null) yield return elem; } - if (Custodian != null) yield return Custodian; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - foreach (var elem in Event) { if (elem != null) yield return elem; } - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ConfidentialityElement != null) yield return new ElementValue("confidentiality", ConfidentialityElement); - foreach (var elem in Attester) { if (elem != null) yield return new ElementValue("attester", elem); } - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1594,7 +1438,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1649,7 +1493,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs index 5d0ca3e620..0ed2fa791a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ConceptMap.cs @@ -311,37 +311,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceElement != null) yield return SourceElement; - if (SourceVersionElement != null) yield return SourceVersionElement; - if (TargetElement != null) yield return TargetElement; - if (TargetVersionElement != null) yield return TargetVersionElement; - foreach (var elem in Element) { if (elem != null) yield return elem; } - if (Unmapped != null) yield return Unmapped; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (SourceVersionElement != null) yield return new ElementValue("sourceVersion", SourceVersionElement); - if (TargetElement != null) yield return new ElementValue("target", TargetElement); - if (TargetVersionElement != null) yield return new ElementValue("targetVersion", TargetVersionElement); - foreach (var elem in Element) { if (elem != null) yield return new ElementValue("element", elem); } - if (Unmapped != null) yield return new ElementValue("unmapped", Unmapped); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +339,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -397,7 +367,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceElement is not null) yield return new KeyValuePair("source",SourceElement); @@ -551,31 +521,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -594,7 +540,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -613,7 +559,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -852,37 +798,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (EquivalenceElement != null) yield return EquivalenceElement; - if (CommentElement != null) yield return CommentElement; - foreach (var elem in DependsOn) { if (elem != null) yield return elem; } - foreach (var elem in Product) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (EquivalenceElement != null) yield return new ElementValue("equivalence", EquivalenceElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in DependsOn) { if (elem != null) yield return new ElementValue("dependsOn", elem); } - foreach (var elem in Product) { if (elem != null) yield return new ElementValue("product", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -910,7 +826,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -938,7 +854,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1144,33 +1060,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PropertyElement != null) yield return PropertyElement; - if (SystemElement != null) yield return SystemElement; - if (ValueElement != null) yield return ValueElement; - if (DisplayElement != null) yield return DisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PropertyElement != null) yield return new ElementValue("property", PropertyElement); - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1192,7 +1082,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1214,7 +1104,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PropertyElement is not null) yield return new KeyValuePair("property",PropertyElement); @@ -1420,33 +1310,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1468,7 +1332,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1490,7 +1354,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -2040,61 +1904,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (Source != null) yield return Source; - if (Target != null) yield return Target; - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (Source != null) yield return new ElementValue("source", Source); - if (Target != null) yield return new ElementValue("target", Target); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2158,7 +1968,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2222,7 +2032,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs b/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs index 0777f09001..9b91a7854f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Condition.cs @@ -259,31 +259,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Summary != null) yield return Summary; - foreach (var elem in Assessment) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Summary != null) yield return new ElementValue("summary", Summary); - foreach (var elem in Assessment) { if (elem != null) yield return new ElementValue("assessment", elem); } - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -302,7 +278,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -321,7 +297,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Summary is not null) yield return new KeyValuePair("summary",Summary); @@ -424,29 +400,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -462,7 +416,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -478,7 +432,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -843,59 +797,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ClinicalStatus != null) yield return ClinicalStatus; - if (VerificationStatus != null) yield return VerificationStatus; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Severity != null) yield return Severity; - if (Code != null) yield return Code; - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Onset != null) yield return Onset; - if (Abatement != null) yield return Abatement; - if (RecordedDateElement != null) yield return RecordedDateElement; - if (Recorder != null) yield return Recorder; - if (Asserter != null) yield return Asserter; - foreach (var elem in Stage) { if (elem != null) yield return elem; } - foreach (var elem in Evidence) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ClinicalStatus != null) yield return new ElementValue("clinicalStatus", ClinicalStatus); - if (VerificationStatus != null) yield return new ElementValue("verificationStatus", VerificationStatus); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Severity != null) yield return new ElementValue("severity", Severity); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Onset != null) yield return new ElementValue("onset", Onset); - if (Abatement != null) yield return new ElementValue("abatement", Abatement); - if (RecordedDateElement != null) yield return new ElementValue("recordedDate", RecordedDateElement); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - if (Asserter != null) yield return new ElementValue("asserter", Asserter); - foreach (var elem in Stage) { if (elem != null) yield return new ElementValue("stage", elem); } - foreach (var elem in Evidence) { if (elem != null) yield return new ElementValue("evidence", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -956,7 +858,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1017,7 +919,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs b/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs index b85387c166..a9460168ef 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Consent.cs @@ -285,29 +285,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AuthorityElement != null) yield return AuthorityElement; - if (UriElement != null) yield return UriElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AuthorityElement != null) yield return new ElementValue("authority", AuthorityElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -323,7 +301,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -339,7 +317,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AuthorityElement is not null) yield return new KeyValuePair("authority",AuthorityElement); @@ -490,31 +468,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VerifiedElement != null) yield return VerifiedElement; - if (VerifiedWith != null) yield return VerifiedWith; - if (VerificationDateElement != null) yield return VerificationDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VerifiedElement != null) yield return new ElementValue("verified", VerifiedElement); - if (VerifiedWith != null) yield return new ElementValue("verifiedWith", VerifiedWith); - if (VerificationDateElement != null) yield return new ElementValue("verificationDate", VerificationDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -533,7 +487,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -552,7 +506,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VerifiedElement is not null) yield return new KeyValuePair("verified",VerifiedElement); @@ -826,47 +780,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Period != null) yield return Period; - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Purpose) { if (elem != null) yield return elem; } - foreach (var elem in Class) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (DataPeriod != null) yield return DataPeriod; - foreach (var elem in Data) { if (elem != null) yield return elem; } - foreach (var elem in Provision) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Purpose) { if (elem != null) yield return new ElementValue("purpose", elem); } - foreach (var elem in Class) { if (elem != null) yield return new ElementValue("class", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (DataPeriod != null) yield return new ElementValue("dataPeriod", DataPeriod); - foreach (var elem in Data) { if (elem != null) yield return new ElementValue("data", elem); } - foreach (var elem in Provision) { if (elem != null) yield return new ElementValue("provision", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -909,7 +823,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -952,7 +866,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1062,29 +976,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1100,7 +992,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1116,7 +1008,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -1236,29 +1128,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MeaningElement != null) yield return MeaningElement; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MeaningElement != null) yield return new ElementValue("meaning", MeaningElement); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1274,7 +1144,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1290,7 +1160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MeaningElement is not null) yield return new KeyValuePair("meaning",MeaningElement); @@ -1606,51 +1476,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Scope != null) yield return Scope; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (DateTimeElement != null) yield return DateTimeElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Organization) { if (elem != null) yield return elem; } - if (Source != null) yield return Source; - foreach (var elem in Policy) { if (elem != null) yield return elem; } - if (PolicyRule != null) yield return PolicyRule; - foreach (var elem in Verification) { if (elem != null) yield return elem; } - if (Provision != null) yield return Provision; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Scope != null) yield return new ElementValue("scope", Scope); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateTimeElement != null) yield return new ElementValue("dateTime", DateTimeElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Organization) { if (elem != null) yield return new ElementValue("organization", elem); } - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Policy) { if (elem != null) yield return new ElementValue("policy", elem); } - if (PolicyRule != null) yield return new ElementValue("policyRule", PolicyRule); - foreach (var elem in Verification) { if (elem != null) yield return new ElementValue("verification", elem); } - if (Provision != null) yield return new ElementValue("provision", Provision); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1699,7 +1525,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1748,7 +1574,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs b/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs index d2b4ffb391..ee5386d2e1 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Contract.cs @@ -472,37 +472,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (Publisher != null) yield return Publisher; - if (PublicationDateElement != null) yield return PublicationDateElement; - if (PublicationStatusElement != null) yield return PublicationStatusElement; - if (CopyrightElement != null) yield return CopyrightElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (Publisher != null) yield return new ElementValue("publisher", Publisher); - if (PublicationDateElement != null) yield return new ElementValue("publicationDate", PublicationDateElement); - if (PublicationStatusElement != null) yield return new ElementValue("publicationStatus", PublicationStatusElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -530,7 +500,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -558,7 +528,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -864,49 +834,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (IssuedElement != null) yield return IssuedElement; - if (Applies != null) yield return Applies; - if (Topic != null) yield return Topic; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (TextElement != null) yield return TextElement; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - if (Offer != null) yield return Offer; - foreach (var elem in Asset) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Applies != null) yield return new ElementValue("applies", Applies); - if (Topic != null) yield return new ElementValue("topic", Topic); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - if (Offer != null) yield return new ElementValue("offer", Offer); - foreach (var elem in Asset) { if (elem != null) yield return new ElementValue("asset", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -952,7 +880,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -998,7 +926,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1161,33 +1089,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in NumberElement) { if (elem != null) yield return elem; } - if (Classification != null) yield return Classification; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Control) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in NumberElement) { if (elem != null) yield return new ElementValue("number", elem); } - if (Classification != null) yield return new ElementValue("classification", Classification); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Control) { if (elem != null) yield return new ElementValue("control", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1209,7 +1111,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1231,7 +1133,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement?.Any() == true) yield return new KeyValuePair("number",NumberElement); @@ -1522,45 +1424,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Party) { if (elem != null) yield return elem; } - if (Topic != null) yield return Topic; - if (Type != null) yield return Type; - if (Decision != null) yield return Decision; - foreach (var elem in DecisionMode) { if (elem != null) yield return elem; } - foreach (var elem in Answer) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Party) { if (elem != null) yield return new ElementValue("party", elem); } - if (Topic != null) yield return new ElementValue("topic", Topic); - if (Type != null) yield return new ElementValue("type", Type); - if (Decision != null) yield return new ElementValue("decision", Decision); - foreach (var elem in DecisionMode) { if (elem != null) yield return new ElementValue("decisionMode", elem); } - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1600,7 +1464,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1640,7 +1504,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1746,29 +1610,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return new ElementValue("reference", elem); } - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1784,7 +1626,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1800,7 +1642,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference?.Any() == true) yield return new KeyValuePair("reference",Reference); @@ -1881,27 +1723,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1914,7 +1736,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1927,7 +1749,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2317,55 +2139,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Scope != null) yield return Scope; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in TypeReference) { if (elem != null) yield return elem; } - foreach (var elem in Subtype) { if (elem != null) yield return elem; } - if (Relationship != null) yield return Relationship; - foreach (var elem in Context) { if (elem != null) yield return elem; } - if (ConditionElement != null) yield return ConditionElement; - foreach (var elem in PeriodType) { if (elem != null) yield return elem; } - foreach (var elem in Period) { if (elem != null) yield return elem; } - foreach (var elem in UsePeriod) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in Answer) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in ValuedItem) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Scope != null) yield return new ElementValue("scope", Scope); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in TypeReference) { if (elem != null) yield return new ElementValue("typeReference", elem); } - foreach (var elem in Subtype) { if (elem != null) yield return new ElementValue("subtype", elem); } - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - foreach (var elem in Context) { if (elem != null) yield return new ElementValue("context", elem); } - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - foreach (var elem in PeriodType) { if (elem != null) yield return new ElementValue("periodType", elem); } - foreach (var elem in Period) { if (elem != null) yield return new ElementValue("period", elem); } - foreach (var elem in UsePeriod) { if (elem != null) yield return new ElementValue("usePeriod", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - foreach (var elem in ValuedItem) { if (elem != null) yield return new ElementValue("valuedItem", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2420,7 +2194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2475,7 +2249,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Scope is not null) yield return new KeyValuePair("scope",Scope); @@ -2619,31 +2393,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2662,7 +2412,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2681,7 +2431,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -3102,53 +2852,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Entity != null) yield return Entity; - if (Identifier != null) yield return Identifier; - if (EffectiveTimeElement != null) yield return EffectiveTimeElement; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (PointsElement != null) yield return PointsElement; - if (Net != null) yield return Net; - if (PaymentElement != null) yield return PaymentElement; - if (PaymentDateElement != null) yield return PaymentDateElement; - if (Responsible != null) yield return Responsible; - if (Recipient != null) yield return Recipient; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Entity != null) yield return new ElementValue("entity", Entity); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (EffectiveTimeElement != null) yield return new ElementValue("effectiveTime", EffectiveTimeElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (PointsElement != null) yield return new ElementValue("points", PointsElement); - if (Net != null) yield return new ElementValue("net", Net); - if (PaymentElement != null) yield return new ElementValue("payment", PaymentElement); - if (PaymentDateElement != null) yield return new ElementValue("paymentDate", PaymentDateElement); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Recipient != null) yield return new ElementValue("recipient", Recipient); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3200,7 +2904,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3252,7 +2956,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Entity is not null) yield return new KeyValuePair("entity",Entity); @@ -3842,67 +3546,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Type != null) yield return Type; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Intent != null) yield return Intent; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (Context != null) yield return Context; - foreach (var elem in ContextLinkIdElement) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - foreach (var elem in Requester) { if (elem != null) yield return elem; } - foreach (var elem in RequesterLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in PerformerType) { if (elem != null) yield return elem; } - if (PerformerRole != null) yield return PerformerRole; - if (Performer != null) yield return Performer; - foreach (var elem in PerformerLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in ReasonElement) { if (elem != null) yield return elem; } - foreach (var elem in ReasonLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Intent != null) yield return new ElementValue("intent", Intent); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in ContextLinkIdElement) { if (elem != null) yield return new ElementValue("contextLinkId", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - foreach (var elem in Requester) { if (elem != null) yield return new ElementValue("requester", elem); } - foreach (var elem in RequesterLinkIdElement) { if (elem != null) yield return new ElementValue("requesterLinkId", elem); } - foreach (var elem in PerformerType) { if (elem != null) yield return new ElementValue("performerType", elem); } - if (PerformerRole != null) yield return new ElementValue("performerRole", PerformerRole); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in PerformerLinkIdElement) { if (elem != null) yield return new ElementValue("performerLinkId", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in ReasonElement) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in ReasonLinkIdElement) { if (elem != null) yield return new ElementValue("reasonLinkId", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3975,7 +3619,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4048,7 +3692,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DoNotPerformElement is not null) yield return new KeyValuePair("doNotPerform",DoNotPerformElement); @@ -4164,29 +3808,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return new ElementValue("reference", elem); } - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4202,7 +3824,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4218,7 +3840,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference?.Any() == true) yield return new KeyValuePair("reference",Reference); @@ -4338,31 +3960,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - foreach (var elem in Signature) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - foreach (var elem in Signature) { if (elem != null) yield return new ElementValue("signature", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4381,7 +3979,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4400,7 +3998,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -4485,27 +4083,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4518,7 +4096,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4531,7 +4109,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -4614,27 +4192,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4647,7 +4205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4660,7 +4218,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -4743,27 +4301,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4776,7 +4314,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4789,7 +4327,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -5572,91 +5110,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (StatusElement != null) yield return StatusElement; - if (LegalState != null) yield return LegalState; - if (InstantiatesCanonical != null) yield return InstantiatesCanonical; - if (InstantiatesUriElement != null) yield return InstantiatesUriElement; - if (ContentDerivative != null) yield return ContentDerivative; - if (IssuedElement != null) yield return IssuedElement; - if (Applies != null) yield return Applies; - if (ExpirationType != null) yield return ExpirationType; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - foreach (var elem in Authority) { if (elem != null) yield return elem; } - foreach (var elem in Domain) { if (elem != null) yield return elem; } - foreach (var elem in Site) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (Author != null) yield return Author; - if (Scope != null) yield return Scope; - if (Topic != null) yield return Topic; - if (Type != null) yield return Type; - foreach (var elem in SubType) { if (elem != null) yield return elem; } - if (ContentDefinition != null) yield return ContentDefinition; - foreach (var elem in Term) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - foreach (var elem in Signer) { if (elem != null) yield return elem; } - foreach (var elem in Friendly) { if (elem != null) yield return elem; } - foreach (var elem in Legal) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - if (LegallyBinding != null) yield return LegallyBinding; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (LegalState != null) yield return new ElementValue("legalState", LegalState); - if (InstantiatesCanonical != null) yield return new ElementValue("instantiatesCanonical", InstantiatesCanonical); - if (InstantiatesUriElement != null) yield return new ElementValue("instantiatesUri", InstantiatesUriElement); - if (ContentDerivative != null) yield return new ElementValue("contentDerivative", ContentDerivative); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Applies != null) yield return new ElementValue("applies", Applies); - if (ExpirationType != null) yield return new ElementValue("expirationType", ExpirationType); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - foreach (var elem in Authority) { if (elem != null) yield return new ElementValue("authority", elem); } - foreach (var elem in Domain) { if (elem != null) yield return new ElementValue("domain", elem); } - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (Author != null) yield return new ElementValue("author", Author); - if (Scope != null) yield return new ElementValue("scope", Scope); - if (Topic != null) yield return new ElementValue("topic", Topic); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in SubType) { if (elem != null) yield return new ElementValue("subType", elem); } - if (ContentDefinition != null) yield return new ElementValue("contentDefinition", ContentDefinition); - foreach (var elem in Term) { if (elem != null) yield return new ElementValue("term", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - foreach (var elem in Signer) { if (elem != null) yield return new ElementValue("signer", elem); } - foreach (var elem in Friendly) { if (elem != null) yield return new ElementValue("friendly", elem); } - foreach (var elem in Legal) { if (elem != null) yield return new ElementValue("legal", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - if (LegallyBinding != null) yield return new ElementValue("legallyBinding", LegallyBinding); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5765,7 +5219,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5874,7 +5328,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Contributor.cs b/src/Hl7.Fhir.R4B/Model/Generated/Contributor.cs index ba06725932..328ee0faf5 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Contributor.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Contributor.cs @@ -221,31 +221,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -264,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +259,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs index 13e41ca46f..7cd448c75a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Coverage.cs @@ -203,31 +203,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ValueElement != null) yield return ValueElement; - if (NameElement != null) yield return NameElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -246,7 +222,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -265,7 +241,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -384,31 +360,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - foreach (var elem in Exception) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Exception) { if (elem != null) yield return new ElementValue("exception", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -427,7 +379,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -446,7 +398,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -545,29 +497,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -583,7 +513,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -599,7 +529,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1050,59 +980,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (PolicyHolder != null) yield return PolicyHolder; - if (Subscriber != null) yield return Subscriber; - if (SubscriberIdElement != null) yield return SubscriberIdElement; - if (Beneficiary != null) yield return Beneficiary; - if (DependentElement != null) yield return DependentElement; - if (Relationship != null) yield return Relationship; - if (Period != null) yield return Period; - foreach (var elem in Payor) { if (elem != null) yield return elem; } - foreach (var elem in Class) { if (elem != null) yield return elem; } - if (OrderElement != null) yield return OrderElement; - if (NetworkElement != null) yield return NetworkElement; - foreach (var elem in CostToBeneficiary) { if (elem != null) yield return elem; } - if (SubrogationElement != null) yield return SubrogationElement; - foreach (var elem in Contract) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (PolicyHolder != null) yield return new ElementValue("policyHolder", PolicyHolder); - if (Subscriber != null) yield return new ElementValue("subscriber", Subscriber); - if (SubscriberIdElement != null) yield return new ElementValue("subscriberId", SubscriberIdElement); - if (Beneficiary != null) yield return new ElementValue("beneficiary", Beneficiary); - if (DependentElement != null) yield return new ElementValue("dependent", DependentElement); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Payor) { if (elem != null) yield return new ElementValue("payor", elem); } - foreach (var elem in Class) { if (elem != null) yield return new ElementValue("class", elem); } - if (OrderElement != null) yield return new ElementValue("order", OrderElement); - if (NetworkElement != null) yield return new ElementValue("network", NetworkElement); - foreach (var elem in CostToBeneficiary) { if (elem != null) yield return new ElementValue("costToBeneficiary", elem); } - if (SubrogationElement != null) yield return new ElementValue("subrogation", SubrogationElement); - foreach (var elem in Contract) { if (elem != null) yield return new ElementValue("contract", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1163,7 +1041,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1224,7 +1102,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs index d8ee875942..2561207732 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityRequest.cs @@ -237,31 +237,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Information != null) yield return Information; - if (AppliesToAllElement != null) yield return AppliesToAllElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Information != null) yield return new ElementValue("information", Information); - if (AppliesToAllElement != null) yield return new ElementValue("appliesToAll", AppliesToAllElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -280,7 +256,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -299,7 +275,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -452,31 +428,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -495,7 +447,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -514,7 +466,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FocalElement is not null) yield return new KeyValuePair("focal",FocalElement); @@ -770,45 +722,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in SupportingInfoSequenceElement) { if (elem != null) yield return elem; } - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Provider != null) yield return Provider; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (Facility != null) yield return Facility; - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in SupportingInfoSequenceElement) { if (elem != null) yield return new ElementValue("supportingInfoSequence", elem); } - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (Facility != null) yield return new ElementValue("facility", Facility); - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -848,7 +762,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -888,7 +802,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SupportingInfoSequenceElement?.Any() == true) yield return new KeyValuePair("supportingInfoSequence",SupportingInfoSequenceElement); @@ -980,27 +894,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Diagnosis != null) yield return Diagnosis; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1013,7 +907,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1026,7 +920,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Diagnosis is not null) yield return new KeyValuePair("diagnosis",Diagnosis); @@ -1379,53 +1273,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Priority != null) yield return Priority; - foreach (var elem in PurposeElement) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Serviced != null) yield return Serviced; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Provider != null) yield return Provider; - if (Insurer != null) yield return Insurer; - if (Facility != null) yield return Facility; - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Priority != null) yield return new ElementValue("priority", Priority); - foreach (var elem in PurposeElement) { if (elem != null) yield return new ElementValue("purpose", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Facility != null) yield return new ElementValue("facility", Facility); - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1477,7 +1325,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1529,7 +1377,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs index 21523ca2eb..c3b310547c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/CoverageEligibilityResponse.cs @@ -235,33 +235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Coverage != null) yield return Coverage; - if (InforceElement != null) yield return InforceElement; - if (BenefitPeriod != null) yield return BenefitPeriod; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (InforceElement != null) yield return new ElementValue("inforce", InforceElement); - if (BenefitPeriod != null) yield return new ElementValue("benefitPeriod", BenefitPeriod); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -283,7 +257,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -305,7 +279,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coverage is not null) yield return new KeyValuePair("coverage",Coverage); @@ -697,53 +671,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Provider != null) yield return Provider; - if (ExcludedElement != null) yield return ExcludedElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Network != null) yield return Network; - if (Unit != null) yield return Unit; - if (Term != null) yield return Term; - foreach (var elem in Benefit) { if (elem != null) yield return elem; } - if (AuthorizationRequiredElement != null) yield return AuthorizationRequiredElement; - foreach (var elem in AuthorizationSupporting) { if (elem != null) yield return elem; } - if (AuthorizationUrlElement != null) yield return AuthorizationUrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ExcludedElement != null) yield return new ElementValue("excluded", ExcludedElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Network != null) yield return new ElementValue("network", Network); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Term != null) yield return new ElementValue("term", Term); - foreach (var elem in Benefit) { if (elem != null) yield return new ElementValue("benefit", elem); } - if (AuthorizationRequiredElement != null) yield return new ElementValue("authorizationRequired", AuthorizationRequiredElement); - foreach (var elem in AuthorizationSupporting) { if (elem != null) yield return new ElementValue("authorizationSupporting", elem); } - if (AuthorizationUrlElement != null) yield return new ElementValue("authorizationUrl", AuthorizationUrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -795,7 +723,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -847,7 +775,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -977,31 +905,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Allowed != null) yield return Allowed; - if (Used != null) yield return Used; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Used != null) yield return new ElementValue("used", Used); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1020,7 +924,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1039,7 +943,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1122,27 +1026,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1155,7 +1039,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1168,7 +1052,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1592,55 +1476,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in PurposeElement) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Serviced != null) yield return Serviced; - if (CreatedElement != null) yield return CreatedElement; - if (Requestor != null) yield return Requestor; - if (Request != null) yield return Request; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (Insurer != null) yield return Insurer; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (PreAuthRefElement != null) yield return PreAuthRefElement; - if (Form != null) yield return Form; - foreach (var elem in Error) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in PurposeElement) { if (elem != null) yield return new ElementValue("purpose", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Requestor != null) yield return new ElementValue("requestor", Requestor); - if (Request != null) yield return new ElementValue("request", Request); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (PreAuthRefElement != null) yield return new ElementValue("preAuthRef", PreAuthRefElement); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1695,7 +1531,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1750,7 +1586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs index 278501a5fa..383d0978aa 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DataRequirement.cs @@ -255,33 +255,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SearchParamElement != null) yield return SearchParamElement; - if (ValueSetElement != null) yield return ValueSetElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SearchParamElement != null) yield return new ElementValue("searchParam", SearchParamElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -303,7 +277,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -325,7 +299,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -477,31 +451,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SearchParamElement != null) yield return SearchParamElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SearchParamElement != null) yield return new ElementValue("searchParam", SearchParamElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -520,7 +470,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -539,7 +489,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -677,29 +627,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (DirectionElement != null) yield return DirectionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (DirectionElement != null) yield return new ElementValue("direction", DirectionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -715,7 +643,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -731,7 +659,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -991,41 +919,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in ProfileElement) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in MustSupportElement) { if (elem != null) yield return elem; } - foreach (var elem in CodeFilter) { if (elem != null) yield return elem; } - foreach (var elem in DateFilter) { if (elem != null) yield return elem; } - if (LimitElement != null) yield return LimitElement; - foreach (var elem in Sort) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in ProfileElement) { if (elem != null) yield return new ElementValue("profile", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in MustSupportElement) { if (elem != null) yield return new ElementValue("mustSupport", elem); } - foreach (var elem in CodeFilter) { if (elem != null) yield return new ElementValue("codeFilter", elem); } - foreach (var elem in DateFilter) { if (elem != null) yield return new ElementValue("dateFilter", elem); } - if (LimitElement != null) yield return new ElementValue("limit", LimitElement); - foreach (var elem in Sort) { if (elem != null) yield return new ElementValue("sort", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1059,7 +953,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1093,7 +987,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs index 821671cad6..9fbd5c647e 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DetectedIssue.cs @@ -179,29 +179,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -217,7 +195,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -233,7 +211,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -367,31 +345,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Action != null) yield return Action; - if (DateElement != null) yield return DateElement; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Action != null) yield return new ElementValue("action", Action); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -410,7 +364,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -429,7 +383,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action is not null) yield return new KeyValuePair("action",Action); @@ -762,49 +716,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Code != null) yield return Code; - if (SeverityElement != null) yield return SeverityElement; - if (Patient != null) yield return Patient; - if (Identified != null) yield return Identified; - if (Author != null) yield return Author; - foreach (var elem in Implicated) { if (elem != null) yield return elem; } - foreach (var elem in Evidence) { if (elem != null) yield return elem; } - if (DetailElement != null) yield return DetailElement; - if (ReferenceElement != null) yield return ReferenceElement; - foreach (var elem in Mitigation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Code != null) yield return new ElementValue("code", Code); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Identified != null) yield return new ElementValue("identified", Identified); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Implicated) { if (elem != null) yield return new ElementValue("implicated", elem); } - foreach (var elem in Evidence) { if (elem != null) yield return new ElementValue("evidence", elem); } - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - foreach (var elem in Mitigation) { if (elem != null) yield return new ElementValue("mitigation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -850,7 +762,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -896,7 +808,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Device.cs b/src/Hl7.Fhir.R4B/Model/Generated/Device.cs index 6c41a9e54b..98bab0ab4d 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Device.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Device.cs @@ -401,37 +401,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DeviceIdentifierElement != null) yield return DeviceIdentifierElement; - if (IssuerElement != null) yield return IssuerElement; - if (JurisdictionElement != null) yield return JurisdictionElement; - if (CarrierAIDCElement != null) yield return CarrierAIDCElement; - if (CarrierHRFElement != null) yield return CarrierHRFElement; - if (EntryTypeElement != null) yield return EntryTypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DeviceIdentifierElement != null) yield return new ElementValue("deviceIdentifier", DeviceIdentifierElement); - if (IssuerElement != null) yield return new ElementValue("issuer", IssuerElement); - if (JurisdictionElement != null) yield return new ElementValue("jurisdiction", JurisdictionElement); - if (CarrierAIDCElement != null) yield return new ElementValue("carrierAIDC", CarrierAIDCElement); - if (CarrierHRFElement != null) yield return new ElementValue("carrierHRF", CarrierHRFElement); - if (EntryTypeElement != null) yield return new ElementValue("entryType", EntryTypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -459,7 +429,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -487,7 +457,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DeviceIdentifierElement is not null) yield return new KeyValuePair("deviceIdentifier",DeviceIdentifierElement); @@ -627,29 +597,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -665,7 +613,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -681,7 +629,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -793,29 +741,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemType != null) yield return SystemType; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemType != null) yield return new ElementValue("systemType", SystemType); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -831,7 +757,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -847,7 +773,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemType is not null) yield return new KeyValuePair("systemType",SystemType); @@ -975,31 +901,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Component != null) yield return Component; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Component != null) yield return new ElementValue("component", Component); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1018,7 +920,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1037,7 +939,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1150,31 +1052,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in ValueQuantity) { if (elem != null) yield return elem; } - foreach (var elem in ValueCode) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in ValueQuantity) { if (elem != null) yield return new ElementValue("valueQuantity", elem); } - foreach (var elem in ValueCode) { if (elem != null) yield return new ElementValue("valueCode", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1193,7 +1071,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1212,7 +1090,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1883,77 +1761,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Definition != null) yield return Definition; - foreach (var elem in UdiCarrier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusReason) { if (elem != null) yield return elem; } - if (DistinctIdentifierElement != null) yield return DistinctIdentifierElement; - if (ManufacturerElement != null) yield return ManufacturerElement; - if (ManufactureDateElement != null) yield return ManufactureDateElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (LotNumberElement != null) yield return LotNumberElement; - if (SerialNumberElement != null) yield return SerialNumberElement; - foreach (var elem in DeviceName) { if (elem != null) yield return elem; } - if (ModelNumberElement != null) yield return ModelNumberElement; - if (PartNumberElement != null) yield return PartNumberElement; - if (Type != null) yield return Type; - foreach (var elem in Specialization) { if (elem != null) yield return elem; } - foreach (var elem in Version) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Owner != null) yield return Owner; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Safety) { if (elem != null) yield return elem; } - if (Parent != null) yield return Parent; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Definition != null) yield return new ElementValue("definition", Definition); - foreach (var elem in UdiCarrier) { if (elem != null) yield return new ElementValue("udiCarrier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusReason) { if (elem != null) yield return new ElementValue("statusReason", elem); } - if (DistinctIdentifierElement != null) yield return new ElementValue("distinctIdentifier", DistinctIdentifierElement); - if (ManufacturerElement != null) yield return new ElementValue("manufacturer", ManufacturerElement); - if (ManufactureDateElement != null) yield return new ElementValue("manufactureDate", ManufactureDateElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (SerialNumberElement != null) yield return new ElementValue("serialNumber", SerialNumberElement); - foreach (var elem in DeviceName) { if (elem != null) yield return new ElementValue("deviceName", elem); } - if (ModelNumberElement != null) yield return new ElementValue("modelNumber", ModelNumberElement); - if (PartNumberElement != null) yield return new ElementValue("partNumber", PartNumberElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Specialization) { if (elem != null) yield return new ElementValue("specialization", elem); } - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Owner != null) yield return new ElementValue("owner", Owner); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Safety) { if (elem != null) yield return new ElementValue("safety", elem); } - if (Parent != null) yield return new ElementValue("parent", Parent); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2041,7 +1849,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2129,7 +1937,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs index ea7676ce37..ca2facc674 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceDefinition.cs @@ -220,31 +220,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DeviceIdentifierElement != null) yield return DeviceIdentifierElement; - if (IssuerElement != null) yield return IssuerElement; - if (JurisdictionElement != null) yield return JurisdictionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DeviceIdentifierElement != null) yield return new ElementValue("deviceIdentifier", DeviceIdentifierElement); - if (IssuerElement != null) yield return new ElementValue("issuer", IssuerElement); - if (JurisdictionElement != null) yield return new ElementValue("jurisdiction", JurisdictionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -263,7 +239,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -282,7 +258,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DeviceIdentifierElement is not null) yield return new KeyValuePair("deviceIdentifier",DeviceIdentifierElement); @@ -416,29 +392,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -454,7 +408,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -470,7 +424,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -600,29 +554,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemTypeElement != null) yield return SystemTypeElement; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemTypeElement != null) yield return new ElementValue("systemType", SystemTypeElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -638,7 +570,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -654,7 +586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemTypeElement is not null) yield return new KeyValuePair("systemType",SystemTypeElement); @@ -749,29 +681,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Description) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Description) { if (elem != null) yield return new ElementValue("description", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -787,7 +697,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -803,7 +713,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -915,31 +825,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in ValueQuantity) { if (elem != null) yield return elem; } - foreach (var elem in ValueCode) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in ValueQuantity) { if (elem != null) yield return new ElementValue("valueQuantity", elem); } - foreach (var elem in ValueCode) { if (elem != null) yield return new ElementValue("valueCode", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -958,7 +844,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -977,7 +863,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1124,31 +1010,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - if (AlternateElement != null) yield return AlternateElement; - if (AllergenicIndicatorElement != null) yield return AllergenicIndicatorElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - if (AlternateElement != null) yield return new ElementValue("alternate", AlternateElement); - if (AllergenicIndicatorElement != null) yield return new ElementValue("allergenicIndicator", AllergenicIndicatorElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1167,7 +1029,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1186,7 +1048,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -1683,69 +1545,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in UdiDeviceIdentifier) { if (elem != null) yield return elem; } - if (Manufacturer != null) yield return Manufacturer; - foreach (var elem in DeviceName) { if (elem != null) yield return elem; } - if (ModelNumberElement != null) yield return ModelNumberElement; - if (Type != null) yield return Type; - foreach (var elem in Specialization) { if (elem != null) yield return elem; } - foreach (var elem in VersionElement) { if (elem != null) yield return elem; } - foreach (var elem in Safety) { if (elem != null) yield return elem; } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return elem; } - if (PhysicalCharacteristics != null) yield return PhysicalCharacteristics; - foreach (var elem in LanguageCode) { if (elem != null) yield return elem; } - foreach (var elem in Capability) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (UrlElement != null) yield return UrlElement; - if (OnlineInformationElement != null) yield return OnlineInformationElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (ParentDevice != null) yield return ParentDevice; - foreach (var elem in Material) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in UdiDeviceIdentifier) { if (elem != null) yield return new ElementValue("udiDeviceIdentifier", elem); } - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - foreach (var elem in DeviceName) { if (elem != null) yield return new ElementValue("deviceName", elem); } - if (ModelNumberElement != null) yield return new ElementValue("modelNumber", ModelNumberElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Specialization) { if (elem != null) yield return new ElementValue("specialization", elem); } - foreach (var elem in VersionElement) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in Safety) { if (elem != null) yield return new ElementValue("safety", elem); } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return new ElementValue("shelfLifeStorage", elem); } - if (PhysicalCharacteristics != null) yield return new ElementValue("physicalCharacteristics", PhysicalCharacteristics); - foreach (var elem in LanguageCode) { if (elem != null) yield return new ElementValue("languageCode", elem); } - foreach (var elem in Capability) { if (elem != null) yield return new ElementValue("capability", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (OnlineInformationElement != null) yield return new ElementValue("onlineInformation", OnlineInformationElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (ParentDevice != null) yield return new ElementValue("parentDevice", ParentDevice); - foreach (var elem in Material) { if (elem != null) yield return new ElementValue("material", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1821,7 +1621,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1897,7 +1697,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs index 91ca6692c1..a73292eac0 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceMetric.cs @@ -412,31 +412,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (StateElement != null) yield return StateElement; - if (TimeElement != null) yield return TimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (StateElement != null) yield return new ElementValue("state", StateElement); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -455,7 +431,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -474,7 +450,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -755,45 +731,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Unit != null) yield return Unit; - if (Source != null) yield return Source; - if (Parent != null) yield return Parent; - if (OperationalStatusElement != null) yield return OperationalStatusElement; - if (ColorElement != null) yield return ColorElement; - if (CategoryElement != null) yield return CategoryElement; - if (MeasurementPeriod != null) yield return MeasurementPeriod; - foreach (var elem in Calibration) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Source != null) yield return new ElementValue("source", Source); - if (Parent != null) yield return new ElementValue("parent", Parent); - if (OperationalStatusElement != null) yield return new ElementValue("operationalStatus", OperationalStatusElement); - if (ColorElement != null) yield return new ElementValue("color", ColorElement); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - if (MeasurementPeriod != null) yield return new ElementValue("measurementPeriod", MeasurementPeriod); - foreach (var elem in Calibration) { if (elem != null) yield return new ElementValue("calibration", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -833,7 +771,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -873,7 +811,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs index dca0d43f3e..d13ff3ed8b 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceRequest.cs @@ -149,29 +149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -187,7 +165,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -203,7 +181,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -794,73 +772,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PriorRequest) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (PerformerType != null) yield return PerformerType; - if (Performer != null) yield return Performer; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PriorRequest) { if (elem != null) yield return new ElementValue("priorRequest", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -942,7 +854,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1024,7 +936,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs b/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs index 00b3b84fbd..7bc58d2504 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DeviceUseStatement.cs @@ -416,51 +416,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - if (RecordedOnElement != null) yield return RecordedOnElement; - if (Source != null) yield return Source; - if (Device != null) yield return Device; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - if (RecordedOnElement != null) yield return new ElementValue("recordedOn", RecordedOnElement); - if (Source != null) yield return new ElementValue("source", Source); - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -509,7 +465,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -558,7 +514,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs index 8ecc5756ac..14bf8a2dcc 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DiagnosticReport.cs @@ -238,29 +238,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CommentElement != null) yield return CommentElement; - if (Link != null) yield return Link; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (Link != null) yield return new ElementValue("link", Link); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -276,7 +254,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -292,7 +270,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CommentElement is not null) yield return new KeyValuePair("comment",CommentElement); @@ -720,61 +698,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in ResultsInterpreter) { if (elem != null) yield return elem; } - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - foreach (var elem in Result) { if (elem != null) yield return elem; } - foreach (var elem in ImagingStudy) { if (elem != null) yield return elem; } - foreach (var elem in Media) { if (elem != null) yield return elem; } - if (ConclusionElement != null) yield return ConclusionElement; - foreach (var elem in ConclusionCode) { if (elem != null) yield return elem; } - foreach (var elem in PresentedForm) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in ResultsInterpreter) { if (elem != null) yield return new ElementValue("resultsInterpreter", elem); } - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - foreach (var elem in Result) { if (elem != null) yield return new ElementValue("result", elem); } - foreach (var elem in ImagingStudy) { if (elem != null) yield return new ElementValue("imagingStudy", elem); } - foreach (var elem in Media) { if (elem != null) yield return new ElementValue("media", elem); } - if (ConclusionElement != null) yield return new ElementValue("conclusion", ConclusionElement); - foreach (var elem in ConclusionCode) { if (elem != null) yield return new ElementValue("conclusionCode", elem); } - foreach (var elem in PresentedForm) { if (elem != null) yield return new ElementValue("presentedForm", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -838,7 +762,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -902,7 +826,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs index 221cc60b49..c58457a7bb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DocumentManifest.cs @@ -149,29 +149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Ref != null) yield return Ref; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Ref != null) yield return new ElementValue("ref", Ref); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -187,7 +165,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -203,7 +181,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -534,49 +512,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MasterIdentifier != null) yield return MasterIdentifier; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (CreatedElement != null) yield return CreatedElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - if (SourceElement != null) yield return SourceElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Content) { if (elem != null) yield return elem; } - foreach (var elem in Related) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MasterIdentifier != null) yield return new ElementValue("masterIdentifier", MasterIdentifier); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -622,7 +558,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -668,7 +604,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MasterIdentifier is not null) yield return new KeyValuePair("masterIdentifier",MasterIdentifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs index 6089f9f418..adbe1ed424 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/DocumentReference.cs @@ -172,29 +172,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +188,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -226,7 +204,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -324,29 +302,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Attachment != null) yield return Attachment; - if (Format != null) yield return Format; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Attachment != null) yield return new ElementValue("attachment", Attachment); - if (Format != null) yield return new ElementValue("format", Format); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -362,7 +318,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -378,7 +334,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Attachment is not null) yield return new KeyValuePair("attachment",Attachment); @@ -567,39 +523,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in Event) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (FacilityType != null) yield return FacilityType; - if (PracticeSetting != null) yield return PracticeSetting; - if (SourcePatientInfo != null) yield return SourcePatientInfo; - foreach (var elem in Related) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (FacilityType != null) yield return new ElementValue("facilityType", FacilityType); - if (PracticeSetting != null) yield return new ElementValue("practiceSetting", PracticeSetting); - if (SourcePatientInfo != null) yield return new ElementValue("sourcePatientInfo", SourcePatientInfo); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -630,7 +554,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -661,7 +585,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Encounter?.Any() == true) yield return new KeyValuePair("encounter",Encounter); @@ -1066,57 +990,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MasterIdentifier != null) yield return MasterIdentifier; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (DocStatusElement != null) yield return DocStatusElement; - if (Type != null) yield return Type; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Authenticator != null) yield return Authenticator; - if (Custodian != null) yield return Custodian; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Content) { if (elem != null) yield return elem; } - if (Context != null) yield return Context; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MasterIdentifier != null) yield return new ElementValue("masterIdentifier", MasterIdentifier); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DocStatusElement != null) yield return new ElementValue("docStatus", DocStatusElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Authenticator != null) yield return new ElementValue("authenticator", Authenticator); - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - if (Context != null) yield return new ElementValue("context", Context); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1174,7 +1048,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1232,7 +1106,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MasterIdentifier is not null) yield return new KeyValuePair("masterIdentifier",MasterIdentifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs index 284f4de6cc..c8f24109cf 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Dosage.cs @@ -167,31 +167,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Dose != null) yield return Dose; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Dose != null) yield return new ElementValue("dose", Dose); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -229,7 +205,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -549,51 +525,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in AdditionalInstruction) { if (elem != null) yield return elem; } - if (PatientInstructionElement != null) yield return PatientInstructionElement; - if (Timing != null) yield return Timing; - if (AsNeeded != null) yield return AsNeeded; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (Method != null) yield return Method; - foreach (var elem in DoseAndRate) { if (elem != null) yield return elem; } - if (MaxDosePerPeriod != null) yield return MaxDosePerPeriod; - if (MaxDosePerAdministration != null) yield return MaxDosePerAdministration; - if (MaxDosePerLifetime != null) yield return MaxDosePerLifetime; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in AdditionalInstruction) { if (elem != null) yield return new ElementValue("additionalInstruction", elem); } - if (PatientInstructionElement != null) yield return new ElementValue("patientInstruction", PatientInstructionElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (AsNeeded != null) yield return new ElementValue("asNeeded", AsNeeded); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (Method != null) yield return new ElementValue("method", Method); - foreach (var elem in DoseAndRate) { if (elem != null) yield return new ElementValue("doseAndRate", elem); } - if (MaxDosePerPeriod != null) yield return new ElementValue("maxDosePerPeriod", MaxDosePerPeriod); - if (MaxDosePerAdministration != null) yield return new ElementValue("maxDosePerAdministration", MaxDosePerAdministration); - if (MaxDosePerLifetime != null) yield return new ElementValue("maxDosePerLifetime", MaxDosePerLifetime); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -642,7 +574,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -691,7 +623,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs index 1d35ae3a75..ed7079ced0 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Encounter.cs @@ -269,29 +269,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -307,7 +285,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -323,7 +301,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); @@ -422,29 +400,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Class != null) yield return Class; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Class != null) yield return new ElementValue("class", Class); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -460,7 +416,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -476,7 +432,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Class is not null) yield return new KeyValuePair("class",Class); @@ -592,31 +548,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Individual != null) yield return Individual; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Individual != null) yield return new ElementValue("individual", Individual); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -635,7 +567,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -654,7 +586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -786,31 +718,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Condition != null) yield return Condition; - if (Use != null) yield return Use; - if (RankElement != null) yield return RankElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Use != null) yield return new ElementValue("use", Use); - if (RankElement != null) yield return new ElementValue("rank", RankElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -829,7 +737,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -848,7 +756,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Condition is not null) yield return new KeyValuePair("condition",Condition); @@ -1071,43 +979,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PreAdmissionIdentifier != null) yield return PreAdmissionIdentifier; - if (Origin != null) yield return Origin; - if (AdmitSource != null) yield return AdmitSource; - if (ReAdmission != null) yield return ReAdmission; - foreach (var elem in DietPreference) { if (elem != null) yield return elem; } - foreach (var elem in SpecialCourtesy) { if (elem != null) yield return elem; } - foreach (var elem in SpecialArrangement) { if (elem != null) yield return elem; } - if (Destination != null) yield return Destination; - if (DischargeDisposition != null) yield return DischargeDisposition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PreAdmissionIdentifier != null) yield return new ElementValue("preAdmissionIdentifier", PreAdmissionIdentifier); - if (Origin != null) yield return new ElementValue("origin", Origin); - if (AdmitSource != null) yield return new ElementValue("admitSource", AdmitSource); - if (ReAdmission != null) yield return new ElementValue("reAdmission", ReAdmission); - foreach (var elem in DietPreference) { if (elem != null) yield return new ElementValue("dietPreference", elem); } - foreach (var elem in SpecialCourtesy) { if (elem != null) yield return new ElementValue("specialCourtesy", elem); } - foreach (var elem in SpecialArrangement) { if (elem != null) yield return new ElementValue("specialArrangement", elem); } - if (Destination != null) yield return new ElementValue("destination", Destination); - if (DischargeDisposition != null) yield return new ElementValue("dischargeDisposition", DischargeDisposition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1144,7 +1016,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1181,7 +1053,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PreAdmissionIdentifier is not null) yield return new KeyValuePair("preAdmissionIdentifier",PreAdmissionIdentifier); @@ -1341,33 +1213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Location != null) yield return Location; - if (StatusElement != null) yield return StatusElement; - if (PhysicalType != null) yield return PhysicalType; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Location != null) yield return new ElementValue("location", Location); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (PhysicalType != null) yield return new ElementValue("physicalType", PhysicalType); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1389,7 +1235,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1411,7 +1257,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Location is not null) yield return new KeyValuePair("location",Location); @@ -1887,71 +1733,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusHistory) { if (elem != null) yield return elem; } - if (Class != null) yield return Class; - foreach (var elem in ClassHistory) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (ServiceType != null) yield return ServiceType; - if (Priority != null) yield return Priority; - if (Subject != null) yield return Subject; - foreach (var elem in EpisodeOfCare) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in Appointment) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Length != null) yield return Length; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - if (Hospitalization != null) yield return Hospitalization; - foreach (var elem in Location) { if (elem != null) yield return elem; } - if (ServiceProvider != null) yield return ServiceProvider; - if (PartOf != null) yield return PartOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusHistory) { if (elem != null) yield return new ElementValue("statusHistory", elem); } - if (Class != null) yield return new ElementValue("class", Class); - foreach (var elem in ClassHistory) { if (elem != null) yield return new ElementValue("classHistory", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (ServiceType != null) yield return new ElementValue("serviceType", ServiceType); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in EpisodeOfCare) { if (elem != null) yield return new ElementValue("episodeOfCare", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in Appointment) { if (elem != null) yield return new ElementValue("appointment", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Length != null) yield return new ElementValue("length", Length); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - if (Hospitalization != null) yield return new ElementValue("hospitalization", Hospitalization); - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - if (ServiceProvider != null) yield return new ElementValue("serviceProvider", ServiceProvider); - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2030,7 +1812,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2109,7 +1891,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs index e51d75d459..5419d39210 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Endpoint.cs @@ -427,47 +427,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ConnectionType != null) yield return ConnectionType; - if (NameElement != null) yield return NameElement; - if (ManagingOrganization != null) yield return ManagingOrganization; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in PayloadType) { if (elem != null) yield return elem; } - foreach (var elem in PayloadMimeTypeElement) { if (elem != null) yield return elem; } - if (AddressElement != null) yield return AddressElement; - foreach (var elem in HeaderElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ConnectionType != null) yield return new ElementValue("connectionType", ConnectionType); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in PayloadType) { if (elem != null) yield return new ElementValue("payloadType", elem); } - foreach (var elem in PayloadMimeTypeElement) { if (elem != null) yield return new ElementValue("payloadMimeType", elem); } - if (AddressElement != null) yield return new ElementValue("address", AddressElement); - foreach (var elem in HeaderElement) { if (elem != null) yield return new ElementValue("header", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -510,7 +470,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -553,7 +513,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs index 1d45182c25..897e554742 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentRequest.cs @@ -259,39 +259,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CreatedElement != null) yield return CreatedElement; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Candidate != null) yield return Candidate; - if (Coverage != null) yield return Coverage; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Candidate != null) yield return new ElementValue("candidate", Candidate); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -322,7 +290,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -353,7 +321,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs index e9d39ab3df..0554d5633d 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EnrollmentResponse.cs @@ -311,41 +311,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Request != null) yield return Request; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (CreatedElement != null) yield return CreatedElement; - if (Organization != null) yield return Organization; - if (RequestProvider != null) yield return RequestProvider; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Request != null) yield return new ElementValue("request", Request); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (RequestProvider != null) yield return new ElementValue("requestProvider", RequestProvider); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -379,7 +345,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -413,7 +379,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs index 531d182042..186d303d86 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EpisodeOfCare.cs @@ -220,29 +220,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -258,7 +236,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -274,7 +252,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); @@ -405,31 +383,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Condition != null) yield return Condition; - if (Role != null) yield return Role; - if (RankElement != null) yield return RankElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Role != null) yield return new ElementValue("role", Role); - if (RankElement != null) yield return new ElementValue("rank", RankElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -448,7 +402,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -467,7 +421,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Condition is not null) yield return new KeyValuePair("condition",Condition); @@ -752,49 +706,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusHistory) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (Period != null) yield return Period; - foreach (var elem in ReferralRequest) { if (elem != null) yield return elem; } - if (CareManager != null) yield return CareManager; - foreach (var elem in Team) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusHistory) { if (elem != null) yield return new ElementValue("statusHistory", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in ReferralRequest) { if (elem != null) yield return new ElementValue("referralRequest", elem); } - if (CareManager != null) yield return new ElementValue("careManager", CareManager); - foreach (var elem in Team) { if (elem != null) yield return new ElementValue("team", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -840,7 +752,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -886,7 +798,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs index 283281dc65..899815ca1a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EventDefinition.cs @@ -838,81 +838,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Trigger) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Trigger) { if (elem != null) yield return new ElementValue("trigger", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1006,7 +932,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1100,7 +1026,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs index 3bb6057f80..8222103e93 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Evidence.cs @@ -233,37 +233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (VariableRole != null) yield return VariableRole; - if (Observed != null) yield return Observed; - if (Intended != null) yield return Intended; - if (DirectnessMatch != null) yield return DirectnessMatch; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (VariableRole != null) yield return new ElementValue("variableRole", VariableRole); - if (Observed != null) yield return new ElementValue("observed", Observed); - if (Intended != null) yield return new ElementValue("intended", Intended); - if (DirectnessMatch != null) yield return new ElementValue("directnessMatch", DirectnessMatch); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -291,7 +261,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -319,7 +289,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -602,45 +572,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (StatisticType != null) yield return StatisticType; - if (Category != null) yield return Category; - if (Quantity != null) yield return Quantity; - if (NumberOfEventsElement != null) yield return NumberOfEventsElement; - if (NumberAffectedElement != null) yield return NumberAffectedElement; - if (SampleSize != null) yield return SampleSize; - foreach (var elem in AttributeEstimate) { if (elem != null) yield return elem; } - foreach (var elem in ModelCharacteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (StatisticType != null) yield return new ElementValue("statisticType", StatisticType); - if (Category != null) yield return new ElementValue("category", Category); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (NumberOfEventsElement != null) yield return new ElementValue("numberOfEvents", NumberOfEventsElement); - if (NumberAffectedElement != null) yield return new ElementValue("numberAffected", NumberAffectedElement); - if (SampleSize != null) yield return new ElementValue("sampleSize", SampleSize); - foreach (var elem in AttributeEstimate) { if (elem != null) yield return new ElementValue("attributeEstimate", elem); } - foreach (var elem in ModelCharacteristic) { if (elem != null) yield return new ElementValue("modelCharacteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -680,7 +612,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -720,7 +652,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -942,35 +874,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (NumberOfStudiesElement != null) yield return NumberOfStudiesElement; - if (NumberOfParticipantsElement != null) yield return NumberOfParticipantsElement; - if (KnownDataCountElement != null) yield return KnownDataCountElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (NumberOfStudiesElement != null) yield return new ElementValue("numberOfStudies", NumberOfStudiesElement); - if (NumberOfParticipantsElement != null) yield return new ElementValue("numberOfParticipants", NumberOfParticipantsElement); - if (KnownDataCountElement != null) yield return new ElementValue("knownDataCount", KnownDataCountElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -995,7 +899,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1020,7 +924,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1238,39 +1142,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - if (LevelElement != null) yield return LevelElement; - if (Range != null) yield return Range; - foreach (var elem in AttributeEstimate) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (LevelElement != null) yield return new ElementValue("level", LevelElement); - if (Range != null) yield return new ElementValue("range", Range); - foreach (var elem in AttributeEstimate) { if (elem != null) yield return new ElementValue("attributeEstimate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1301,7 +1173,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1332,7 +1204,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1469,33 +1341,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - foreach (var elem in Variable) { if (elem != null) yield return elem; } - foreach (var elem in AttributeEstimate) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Variable) { if (elem != null) yield return new ElementValue("variable", elem); } - foreach (var elem in AttributeEstimate) { if (elem != null) yield return new ElementValue("attributeEstimate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1517,7 +1363,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1539,7 +1385,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1708,35 +1554,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VariableDefinition != null) yield return VariableDefinition; - if (HandlingElement != null) yield return HandlingElement; - foreach (var elem in ValueCategory) { if (elem != null) yield return elem; } - foreach (var elem in ValueQuantity) { if (elem != null) yield return elem; } - foreach (var elem in ValueRange) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VariableDefinition != null) yield return new ElementValue("variableDefinition", VariableDefinition); - if (HandlingElement != null) yield return new ElementValue("handling", HandlingElement); - foreach (var elem in ValueCategory) { if (elem != null) yield return new ElementValue("valueCategory", elem); } - foreach (var elem in ValueQuantity) { if (elem != null) yield return new ElementValue("valueQuantity", elem); } - foreach (var elem in ValueRange) { if (elem != null) yield return new ElementValue("valueRange", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1761,7 +1579,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1786,7 +1604,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VariableDefinition is not null) yield return new KeyValuePair("variableDefinition",VariableDefinition); @@ -1989,37 +1807,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Rating != null) yield return Rating; - if (RaterElement != null) yield return RaterElement; - foreach (var elem in Subcomponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Rating != null) yield return new ElementValue("rating", Rating); - if (RaterElement != null) yield return new ElementValue("rater", RaterElement); - foreach (var elem in Subcomponent) { if (elem != null) yield return new ElementValue("subcomponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2047,7 +1835,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2075,7 +1863,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -2729,75 +2517,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (TitleElement != null) yield return TitleElement; - if (CiteAs != null) yield return CiteAs; - if (StatusElement != null) yield return StatusElement; - if (DateElement != null) yield return DateElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (AssertionElement != null) yield return AssertionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in VariableDefinition) { if (elem != null) yield return elem; } - if (SynthesisType != null) yield return SynthesisType; - if (StudyType != null) yield return StudyType; - foreach (var elem in Statistic) { if (elem != null) yield return elem; } - foreach (var elem in Certainty) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (CiteAs != null) yield return new ElementValue("citeAs", CiteAs); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (AssertionElement != null) yield return new ElementValue("assertion", AssertionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in VariableDefinition) { if (elem != null) yield return new ElementValue("variableDefinition", elem); } - if (SynthesisType != null) yield return new ElementValue("synthesisType", SynthesisType); - if (StudyType != null) yield return new ElementValue("studyType", StudyType); - foreach (var elem in Statistic) { if (elem != null) yield return new ElementValue("statistic", elem); } - foreach (var elem in Certainty) { if (elem != null) yield return new ElementValue("certainty", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2882,7 +2602,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2967,7 +2687,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs index 95078ee47f..37296927b4 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceReport.cs @@ -207,29 +207,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -245,7 +223,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -261,7 +239,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Characteristic?.Any() == true) yield return new KeyValuePair("characteristic",Characteristic); @@ -410,33 +388,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (ExcludeElement != null) yield return ExcludeElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -458,7 +410,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -480,7 +432,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -604,29 +556,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -642,7 +572,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -658,7 +588,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -967,49 +897,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Focus != null) yield return Focus; - if (FocusReference != null) yield return FocusReference; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Text != null) yield return Text; - if (ModeElement != null) yield return ModeElement; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in EntryClassifier) { if (elem != null) yield return elem; } - foreach (var elem in EntryReference) { if (elem != null) yield return elem; } - foreach (var elem in EntryQuantity) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Focus != null) yield return new ElementValue("focus", Focus); - if (FocusReference != null) yield return new ElementValue("focusReference", FocusReference); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Text != null) yield return new ElementValue("text", Text); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in EntryClassifier) { if (elem != null) yield return new ElementValue("entryClassifier", elem); } - foreach (var elem in EntryReference) { if (elem != null) yield return new ElementValue("entryReference", elem); } - foreach (var elem in EntryQuantity) { if (elem != null) yield return new ElementValue("entryQuantity", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1055,7 +943,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1101,7 +989,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1523,61 +1411,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in RelatedIdentifier) { if (elem != null) yield return elem; } - if (CiteAs != null) yield return CiteAs; - if (Type != null) yield return Type; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in RelatedIdentifier) { if (elem != null) yield return new ElementValue("relatedIdentifier", elem); } - if (CiteAs != null) yield return new ElementValue("citeAs", CiteAs); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1641,7 +1475,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1705,7 +1539,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs index ebb71805c5..02f640cbe3 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/EvidenceVariable.cs @@ -313,39 +313,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Definition != null) yield return Definition; - if (Method != null) yield return Method; - if (Device != null) yield return Device; - if (ExcludeElement != null) yield return ExcludeElement; - if (TimeFromStart != null) yield return TimeFromStart; - if (GroupMeasureElement != null) yield return GroupMeasureElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Definition != null) yield return new ElementValue("definition", Definition); - if (Method != null) yield return new ElementValue("method", Method); - if (Device != null) yield return new ElementValue("device", Device); - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (TimeFromStart != null) yield return new ElementValue("timeFromStart", TimeFromStart); - if (GroupMeasureElement != null) yield return new ElementValue("groupMeasure", GroupMeasureElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -376,7 +344,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -407,7 +375,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -559,33 +527,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Quantity != null) yield return Quantity; - if (Range != null) yield return Range; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Range != null) yield return new ElementValue("range", Range); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -607,7 +549,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -629,7 +571,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -747,29 +689,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -785,7 +705,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -801,7 +721,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1487,73 +1407,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (ShortTitleElement != null) yield return ShortTitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (DateElement != null) yield return DateElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (ActualElement != null) yield return ActualElement; - if (CharacteristicCombinationElement != null) yield return CharacteristicCombinationElement; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - if (HandlingElement != null) yield return HandlingElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ShortTitleElement != null) yield return new ElementValue("shortTitle", ShortTitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - if (CharacteristicCombinationElement != null) yield return new ElementValue("characteristicCombination", CharacteristicCombinationElement); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - if (HandlingElement != null) yield return new ElementValue("handling", HandlingElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1635,7 +1489,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1717,7 +1571,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs index 0a1726554a..edb2347bff 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ExampleScenario.cs @@ -270,33 +270,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActorIdElement != null) yield return ActorIdElement; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActorIdElement != null) yield return new ElementValue("actorId", ActorIdElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -318,7 +292,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -340,7 +314,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActorIdElement is not null) yield return new KeyValuePair("actorId",ActorIdElement); @@ -577,37 +551,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResourceIdElement != null) yield return ResourceIdElement; - if (ResourceTypeElement != null) yield return ResourceTypeElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Version) { if (elem != null) yield return elem; } - foreach (var elem in ContainedInstance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResourceIdElement != null) yield return new ElementValue("resourceId", ResourceIdElement); - if (ResourceTypeElement != null) yield return new ElementValue("resourceType", ResourceTypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in ContainedInstance) { if (elem != null) yield return new ElementValue("containedInstance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -635,7 +579,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -663,7 +607,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResourceIdElement is not null) yield return new KeyValuePair("resourceId",ResourceIdElement); @@ -798,29 +742,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VersionIdElement != null) yield return VersionIdElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VersionIdElement != null) yield return new ElementValue("versionId", VersionIdElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -836,7 +758,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -852,7 +774,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VersionIdElement is not null) yield return new KeyValuePair("versionId",VersionIdElement); @@ -985,29 +907,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResourceIdElement != null) yield return ResourceIdElement; - if (VersionIdElement != null) yield return VersionIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResourceIdElement != null) yield return new ElementValue("resourceId", ResourceIdElement); - if (VersionIdElement != null) yield return new ElementValue("versionId", VersionIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1023,7 +923,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1039,7 +939,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResourceIdElement is not null) yield return new KeyValuePair("resourceId",ResourceIdElement); @@ -1254,35 +1154,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (PreConditionsElement != null) yield return PreConditionsElement; - if (PostConditionsElement != null) yield return PostConditionsElement; - foreach (var elem in Step) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PreConditionsElement != null) yield return new ElementValue("preConditions", PreConditionsElement); - if (PostConditionsElement != null) yield return new ElementValue("postConditions", PostConditionsElement); - foreach (var elem in Step) { if (elem != null) yield return new ElementValue("step", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1307,7 +1179,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1332,7 +1204,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1480,33 +1352,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Process) { if (elem != null) yield return elem; } - if (PauseElement != null) yield return PauseElement; - if (Operation != null) yield return Operation; - foreach (var elem in Alternative) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Process) { if (elem != null) yield return new ElementValue("process", elem); } - if (PauseElement != null) yield return new ElementValue("pause", PauseElement); - if (Operation != null) yield return new ElementValue("operation", Operation); - foreach (var elem in Alternative) { if (elem != null) yield return new ElementValue("alternative", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1528,7 +1374,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1550,7 +1396,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Process?.Any() == true) yield return new KeyValuePair("process",Process); @@ -1918,45 +1764,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - if (InitiatorElement != null) yield return InitiatorElement; - if (ReceiverElement != null) yield return ReceiverElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (InitiatorActiveElement != null) yield return InitiatorActiveElement; - if (ReceiverActiveElement != null) yield return ReceiverActiveElement; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (InitiatorElement != null) yield return new ElementValue("initiator", InitiatorElement); - if (ReceiverElement != null) yield return new ElementValue("receiver", ReceiverElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (InitiatorActiveElement != null) yield return new ElementValue("initiatorActive", InitiatorActiveElement); - if (ReceiverActiveElement != null) yield return new ElementValue("receiverActive", ReceiverActiveElement); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1996,7 +1804,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2036,7 +1844,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -2194,31 +2002,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Step) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Step) { if (elem != null) yield return new ElementValue("step", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2237,7 +2021,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2256,7 +2040,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -2771,59 +2555,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (PurposeElement != null) yield return PurposeElement; - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Process) { if (elem != null) yield return elem; } - foreach (var elem in WorkflowElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Process) { if (elem != null) yield return new ElementValue("process", elem); } - foreach (var elem in WorkflowElement) { if (elem != null) yield return new ElementValue("workflow", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2884,7 +2616,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2945,7 +2677,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs index 7cc5ec41fd..980bae0491 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ExplanationOfBenefit.cs @@ -200,31 +200,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Claim != null) yield return Claim; - if (Relationship != null) yield return Relationship; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Claim != null) yield return new ElementValue("claim", Claim); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -243,7 +219,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -262,7 +238,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Claim is not null) yield return new KeyValuePair("claim",Claim); @@ -363,29 +339,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -401,7 +355,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -417,7 +371,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -603,35 +557,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Provider != null) yield return Provider; - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Role != null) yield return Role; - if (Qualification != null) yield return Qualification; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Role != null) yield return new ElementValue("role", Role); - if (Qualification != null) yield return new ElementValue("qualification", Qualification); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -656,7 +582,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -681,7 +607,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -873,37 +799,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Timing != null) yield return Timing; - if (Value != null) yield return Value; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Value != null) yield return new ElementValue("value", Value); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -931,7 +827,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -959,7 +855,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1135,35 +1031,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Diagnosis != null) yield return Diagnosis; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (OnAdmission != null) yield return OnAdmission; - if (PackageCode != null) yield return PackageCode; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (OnAdmission != null) yield return new ElementValue("onAdmission", OnAdmission); - if (PackageCode != null) yield return new ElementValue("packageCode", PackageCode); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1188,7 +1056,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1213,7 +1081,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1407,35 +1275,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (Procedure != null) yield return Procedure; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1460,7 +1300,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1485,7 +1325,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1642,31 +1482,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1685,7 +1501,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1704,7 +1520,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FocalElement is not null) yield return new KeyValuePair("focal",FocalElement); @@ -1839,31 +1655,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Type != null) yield return Type; - if (Location != null) yield return Location; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Location != null) yield return new ElementValue("location", Location); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1882,7 +1674,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1901,7 +1693,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -2491,71 +2283,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return new ElementValue("careTeamSequence", elem); } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return new ElementValue("diagnosisSequence", elem); } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return new ElementValue("procedureSequence", elem); } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return new ElementValue("informationSequence", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2634,7 +2362,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2713,7 +2441,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -2883,33 +2611,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Reason != null) yield return Reason; - if (Amount != null) yield return Amount; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2931,7 +2633,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2953,7 +2655,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -3312,53 +3014,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3410,7 +3066,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3462,7 +3118,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3814,51 +3470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3907,7 +3519,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3956,7 +3568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4433,61 +4045,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in SubDetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in Provider) { if (elem != null) yield return elem; } - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return new ElementValue("itemSequence", elem); } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return new ElementValue("detailSequence", elem); } - foreach (var elem in SubDetailSequenceElement) { if (elem != null) yield return new ElementValue("subDetailSequence", elem); } - foreach (var elem in Provider) { if (elem != null) yield return new ElementValue("provider", elem); } - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4551,7 +4109,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4615,7 +4173,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement?.Any() == true) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -4882,43 +4440,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4955,7 +4477,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4992,7 +4514,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductOrService is not null) yield return new KeyValuePair("productOrService",ProductOrService); @@ -5233,41 +4755,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5301,7 +4789,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5335,7 +4823,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductOrService is not null) yield return new KeyValuePair("productOrService",ProductOrService); @@ -5441,29 +4929,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5479,7 +4945,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5495,7 +4961,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -5675,37 +5141,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Adjustment != null) yield return Adjustment; - if (AdjustmentReason != null) yield return AdjustmentReason; - if (DateElement != null) yield return DateElement; - if (Amount != null) yield return Amount; - if (Identifier != null) yield return Identifier; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Adjustment != null) yield return new ElementValue("adjustment", Adjustment); - if (AdjustmentReason != null) yield return new ElementValue("adjustmentReason", AdjustmentReason); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5733,7 +5169,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5761,7 +5197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -5950,33 +5386,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5998,7 +5408,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6020,7 +5430,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -6271,41 +5681,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (ExcludedElement != null) yield return ExcludedElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Network != null) yield return Network; - if (Unit != null) yield return Unit; - if (Term != null) yield return Term; - foreach (var elem in Financial) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (ExcludedElement != null) yield return new ElementValue("excluded", ExcludedElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Network != null) yield return new ElementValue("network", Network); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Term != null) yield return new ElementValue("term", Term); - foreach (var elem in Financial) { if (elem != null) yield return new ElementValue("financial", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6339,7 +5715,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6373,7 +5749,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -6497,31 +5873,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Allowed != null) yield return Allowed; - if (Used != null) yield return Used; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Used != null) yield return new ElementValue("used", Used); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6540,7 +5892,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6559,7 +5911,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -7479,111 +6831,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (BillablePeriod != null) yield return BillablePeriod; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Priority != null) yield return Priority; - if (FundsReserveRequested != null) yield return FundsReserveRequested; - if (FundsReserve != null) yield return FundsReserve; - foreach (var elem in Related) { if (elem != null) yield return elem; } - if (Prescription != null) yield return Prescription; - if (OriginalPrescription != null) yield return OriginalPrescription; - if (Payee != null) yield return Payee; - if (Referral != null) yield return Referral; - if (Facility != null) yield return Facility; - if (Claim != null) yield return Claim; - if (ClaimResponse != null) yield return ClaimResponse; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - foreach (var elem in PreAuthRefPeriod) { if (elem != null) yield return elem; } - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - if (PrecedenceElement != null) yield return PrecedenceElement; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (Accident != null) yield return Accident; - foreach (var elem in Item) { if (elem != null) yield return elem; } - foreach (var elem in AddItem) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Total) { if (elem != null) yield return elem; } - if (Payment != null) yield return Payment; - if (FormCode != null) yield return FormCode; - if (Form != null) yield return Form; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - if (BenefitPeriod != null) yield return BenefitPeriod; - foreach (var elem in BenefitBalance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (BillablePeriod != null) yield return new ElementValue("billablePeriod", BillablePeriod); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (FundsReserveRequested != null) yield return new ElementValue("fundsReserveRequested", FundsReserveRequested); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - if (Prescription != null) yield return new ElementValue("prescription", Prescription); - if (OriginalPrescription != null) yield return new ElementValue("originalPrescription", OriginalPrescription); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Referral != null) yield return new ElementValue("referral", Referral); - if (Facility != null) yield return new ElementValue("facility", Facility); - if (Claim != null) yield return new ElementValue("claim", Claim); - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - foreach (var elem in PreAuthRefPeriod) { if (elem != null) yield return new ElementValue("preAuthRefPeriod", elem); } - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - if (PrecedenceElement != null) yield return new ElementValue("precedence", PrecedenceElement); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (Accident != null) yield return new ElementValue("accident", Accident); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - foreach (var elem in AddItem) { if (elem != null) yield return new ElementValue("addItem", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Total) { if (elem != null) yield return new ElementValue("total", elem); } - if (Payment != null) yield return new ElementValue("payment", Payment); - if (FormCode != null) yield return new ElementValue("formCode", FormCode); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - if (BenefitPeriod != null) yield return new ElementValue("benefitPeriod", BenefitPeriod); - foreach (var elem in BenefitBalance) { if (elem != null) yield return new ElementValue("benefitBalance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -7722,7 +6970,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -7861,7 +7109,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Expression.cs b/src/Hl7.Fhir.R4B/Model/Generated/Expression.cs index 1ad43775f2..8b86393a8f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Expression.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Expression.cs @@ -270,35 +270,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (NameElement != null) yield return NameElement; - if (LanguageElement != null) yield return LanguageElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (ReferenceElement != null) yield return ReferenceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -323,7 +295,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -348,7 +320,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs index 57e2f81468..713176181c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/FamilyMemberHistory.cs @@ -252,35 +252,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Outcome != null) yield return Outcome; - if (ContributedToDeathElement != null) yield return ContributedToDeathElement; - if (Onset != null) yield return Onset; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (ContributedToDeathElement != null) yield return new ElementValue("contributedToDeath", ContributedToDeathElement); - if (Onset != null) yield return new ElementValue("onset", Onset); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -305,7 +277,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -330,7 +302,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -805,61 +777,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (DataAbsentReason != null) yield return DataAbsentReason; - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (NameElement != null) yield return NameElement; - if (Relationship != null) yield return Relationship; - if (Sex != null) yield return Sex; - if (Born != null) yield return Born; - if (Age != null) yield return Age; - if (EstimatedAgeElement != null) yield return EstimatedAgeElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Sex != null) yield return new ElementValue("sex", Sex); - if (Born != null) yield return new ElementValue("born", Born); - if (Age != null) yield return new ElementValue("age", Age); - if (EstimatedAgeElement != null) yield return new ElementValue("estimatedAge", EstimatedAgeElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -923,7 +841,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -987,7 +905,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs b/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs index 84bb347b2f..eafa8bcace 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Flag.cs @@ -289,41 +289,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Period != null) yield return Period; - if (Encounter != null) yield return Encounter; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Period != null) yield return new ElementValue("period", Period); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -357,7 +323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -391,7 +357,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs b/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs index b6cc33bdd1..ead7c1a8ec 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Goal.cs @@ -234,31 +234,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Measure != null) yield return Measure; - if (Detail != null) yield return Detail; - if (Due != null) yield return Due; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Measure != null) yield return new ElementValue("measure", Measure); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (Due != null) yield return new ElementValue("due", Due); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -277,7 +253,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -296,7 +272,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Measure is not null) yield return new KeyValuePair("measure",Measure); @@ -685,57 +661,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (LifecycleStatusElement != null) yield return LifecycleStatusElement; - if (AchievementStatus != null) yield return AchievementStatus; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Priority != null) yield return Priority; - if (Description != null) yield return Description; - if (Subject != null) yield return Subject; - if (Start != null) yield return Start; - foreach (var elem in Target) { if (elem != null) yield return elem; } - if (StatusDateElement != null) yield return StatusDateElement; - if (StatusReasonElement != null) yield return StatusReasonElement; - if (ExpressedBy != null) yield return ExpressedBy; - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeCode) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeReference) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (LifecycleStatusElement != null) yield return new ElementValue("lifecycleStatus", LifecycleStatusElement); - if (AchievementStatus != null) yield return new ElementValue("achievementStatus", AchievementStatus); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Description != null) yield return new ElementValue("description", Description); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Start != null) yield return new ElementValue("start", Start); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (StatusReasonElement != null) yield return new ElementValue("statusReason", StatusReasonElement); - if (ExpressedBy != null) yield return new ElementValue("expressedBy", ExpressedBy); - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in OutcomeCode) { if (elem != null) yield return new ElementValue("outcomeCode", elem); } - foreach (var elem in OutcomeReference) { if (elem != null) yield return new ElementValue("outcomeReference", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -793,7 +719,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -851,7 +777,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs index 9441cc76e4..df30976ee3 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/GraphDefinition.cs @@ -354,37 +354,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SliceNameElement != null) yield return SliceNameElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SliceNameElement != null) yield return new ElementValue("sliceName", SliceNameElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -412,7 +382,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -440,7 +410,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -644,35 +614,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ParamsElement != null) yield return ParamsElement; - if (ProfileElement != null) yield return ProfileElement; - foreach (var elem in Compartment) { if (elem != null) yield return elem; } - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ParamsElement != null) yield return new ElementValue("params", ParamsElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - foreach (var elem in Compartment) { if (elem != null) yield return new ElementValue("compartment", elem); } - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -697,7 +639,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -722,7 +664,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -965,35 +907,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (CodeElement != null) yield return CodeElement; - if (RuleElement != null) yield return RuleElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (RuleElement != null) yield return new ElementValue("rule", RuleElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1018,7 +932,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1043,7 +957,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); @@ -1544,55 +1458,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (StartElement != null) yield return StartElement; - if (ProfileElement != null) yield return ProfileElement; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1647,7 +1513,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1702,7 +1568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Group.cs b/src/Hl7.Fhir.R4B/Model/Generated/Group.cs index 0531cd0217..a1ee744fa0 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Group.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Group.cs @@ -251,33 +251,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (ExcludeElement != null) yield return ExcludeElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -299,7 +273,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -321,7 +295,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -456,31 +430,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Entity != null) yield return Entity; - if (Period != null) yield return Period; - if (InactiveElement != null) yield return InactiveElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Entity != null) yield return new ElementValue("entity", Entity); - if (Period != null) yield return new ElementValue("period", Period); - if (InactiveElement != null) yield return new ElementValue("inactive", InactiveElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -499,7 +449,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -518,7 +468,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Entity is not null) yield return new KeyValuePair("entity",Entity); @@ -829,45 +779,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (TypeElement != null) yield return TypeElement; - if (ActualElement != null) yield return ActualElement; - if (Code != null) yield return Code; - if (NameElement != null) yield return NameElement; - if (QuantityElement != null) yield return QuantityElement; - if (ManagingEntity != null) yield return ManagingEntity; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Member) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - if (Code != null) yield return new ElementValue("code", Code); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (QuantityElement != null) yield return new ElementValue("quantity", QuantityElement); - if (ManagingEntity != null) yield return new ElementValue("managingEntity", ManagingEntity); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Member) { if (elem != null) yield return new ElementValue("member", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -907,7 +819,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -947,7 +859,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs index f79ea07761..7533d3eb58 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/GuidanceResponse.cs @@ -448,55 +448,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RequestIdentifier != null) yield return RequestIdentifier; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Module != null) yield return Module; - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (OccurrenceDateTimeElement != null) yield return OccurrenceDateTimeElement; - if (Performer != null) yield return Performer; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in EvaluationMessage) { if (elem != null) yield return elem; } - if (OutputParameters != null) yield return OutputParameters; - if (Result != null) yield return Result; - foreach (var elem in DataRequirement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RequestIdentifier != null) yield return new ElementValue("requestIdentifier", RequestIdentifier); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Module != null) yield return new ElementValue("module", Module); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (OccurrenceDateTimeElement != null) yield return new ElementValue("occurrenceDateTime", OccurrenceDateTimeElement); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in EvaluationMessage) { if (elem != null) yield return new ElementValue("evaluationMessage", elem); } - if (OutputParameters != null) yield return new ElementValue("outputParameters", OutputParameters); - if (Result != null) yield return new ElementValue("result", Result); - foreach (var elem in DataRequirement) { if (elem != null) yield return new ElementValue("dataRequirement", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -551,7 +503,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -606,7 +558,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RequestIdentifier is not null) yield return new KeyValuePair("requestIdentifier",RequestIdentifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs index c0ed0b9eba..92f5478ae6 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/HealthcareService.cs @@ -162,29 +162,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -200,7 +178,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -216,7 +194,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -420,33 +398,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return elem; } - if (AllDayElement != null) yield return AllDayElement; - if (AvailableStartTimeElement != null) yield return AvailableStartTimeElement; - if (AvailableEndTimeElement != null) yield return AvailableEndTimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return new ElementValue("daysOfWeek", elem); } - if (AllDayElement != null) yield return new ElementValue("allDay", AllDayElement); - if (AvailableStartTimeElement != null) yield return new ElementValue("availableStartTime", AvailableStartTimeElement); - if (AvailableEndTimeElement != null) yield return new ElementValue("availableEndTime", AvailableEndTimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -468,7 +420,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -490,7 +442,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DaysOfWeekElement?.Any() == true) yield return new KeyValuePair("daysOfWeek",DaysOfWeekElement); @@ -607,29 +559,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (During != null) yield return During; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (During != null) yield return new ElementValue("during", During); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -645,7 +575,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -661,7 +591,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1235,73 +1165,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (ProvidedBy != null) yield return ProvidedBy; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (CommentElement != null) yield return CommentElement; - if (ExtraDetailsElement != null) yield return ExtraDetailsElement; - if (Photo != null) yield return Photo; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in ServiceProvisionCode) { if (elem != null) yield return elem; } - foreach (var elem in Eligibility) { if (elem != null) yield return elem; } - foreach (var elem in Program) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - foreach (var elem in ReferralMethod) { if (elem != null) yield return elem; } - if (AppointmentRequiredElement != null) yield return AppointmentRequiredElement; - foreach (var elem in AvailableTime) { if (elem != null) yield return elem; } - foreach (var elem in NotAvailable) { if (elem != null) yield return elem; } - if (AvailabilityExceptionsElement != null) yield return AvailabilityExceptionsElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (ProvidedBy != null) yield return new ElementValue("providedBy", ProvidedBy); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (ExtraDetailsElement != null) yield return new ElementValue("extraDetails", ExtraDetailsElement); - if (Photo != null) yield return new ElementValue("photo", Photo); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in ServiceProvisionCode) { if (elem != null) yield return new ElementValue("serviceProvisionCode", elem); } - foreach (var elem in Eligibility) { if (elem != null) yield return new ElementValue("eligibility", elem); } - foreach (var elem in Program) { if (elem != null) yield return new ElementValue("program", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - foreach (var elem in ReferralMethod) { if (elem != null) yield return new ElementValue("referralMethod", elem); } - if (AppointmentRequiredElement != null) yield return new ElementValue("appointmentRequired", AppointmentRequiredElement); - foreach (var elem in AvailableTime) { if (elem != null) yield return new ElementValue("availableTime", elem); } - foreach (var elem in NotAvailable) { if (elem != null) yield return new ElementValue("notAvailable", elem); } - if (AvailabilityExceptionsElement != null) yield return new ElementValue("availabilityExceptions", AvailabilityExceptionsElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1383,7 +1247,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1465,7 +1329,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/HumanName.cs b/src/Hl7.Fhir.R4B/Model/Generated/HumanName.cs index f8583400bf..ce6de13581 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/HumanName.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/HumanName.cs @@ -376,39 +376,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (TextElement != null) yield return TextElement; - if (FamilyElement != null) yield return FamilyElement; - foreach (var elem in GivenElement) { if (elem != null) yield return elem; } - foreach (var elem in PrefixElement) { if (elem != null) yield return elem; } - foreach (var elem in SuffixElement) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (FamilyElement != null) yield return new ElementValue("family", FamilyElement); - foreach (var elem in GivenElement) { if (elem != null) yield return new ElementValue("given", elem); } - foreach (var elem in PrefixElement) { if (elem != null) yield return new ElementValue("prefix", elem); } - foreach (var elem in SuffixElement) { if (elem != null) yield return new ElementValue("suffix", elem); } - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +407,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -470,7 +438,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs index 5f0a92dc1f..fe03e2db0e 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ImagingStudy.cs @@ -449,49 +449,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (NumberElement != null) yield return NumberElement; - if (Modality != null) yield return Modality; - if (DescriptionElement != null) yield return DescriptionElement; - if (NumberOfInstancesElement != null) yield return NumberOfInstancesElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (Laterality != null) yield return Laterality; - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - if (StartedElement != null) yield return StartedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (Modality != null) yield return new ElementValue("modality", Modality); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (NumberOfInstancesElement != null) yield return new ElementValue("numberOfInstances", NumberOfInstancesElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Laterality != null) yield return new ElementValue("laterality", Laterality); - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - if (StartedElement != null) yield return new ElementValue("started", StartedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -537,7 +495,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -583,7 +541,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -694,29 +652,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -732,7 +668,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -748,7 +684,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -933,33 +869,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (SopClass != null) yield return SopClass; - if (NumberElement != null) yield return NumberElement; - if (TitleElement != null) yield return TitleElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (SopClass != null) yield return new ElementValue("sopClass", SopClass); - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -981,7 +891,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1003,7 +913,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -1500,65 +1410,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Modality) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (StartedElement != null) yield return StartedElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (Referrer != null) yield return Referrer; - foreach (var elem in Interpreter) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (NumberOfSeriesElement != null) yield return NumberOfSeriesElement; - if (NumberOfInstancesElement != null) yield return NumberOfInstancesElement; - if (ProcedureReference != null) yield return ProcedureReference; - foreach (var elem in ProcedureCode) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Series) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Modality) { if (elem != null) yield return new ElementValue("modality", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (StartedElement != null) yield return new ElementValue("started", StartedElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (Referrer != null) yield return new ElementValue("referrer", Referrer); - foreach (var elem in Interpreter) { if (elem != null) yield return new ElementValue("interpreter", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (NumberOfSeriesElement != null) yield return new ElementValue("numberOfSeries", NumberOfSeriesElement); - if (NumberOfInstancesElement != null) yield return new ElementValue("numberOfInstances", NumberOfInstancesElement); - if (ProcedureReference != null) yield return new ElementValue("procedureReference", ProcedureReference); - foreach (var elem in ProcedureCode) { if (elem != null) yield return new ElementValue("procedureCode", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Series) { if (elem != null) yield return new ElementValue("series", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1628,7 +1480,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1698,7 +1550,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs index 8ec27e8e36..f4ba6977b1 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Immunization.cs @@ -178,29 +178,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -216,7 +194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -232,7 +210,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -432,33 +410,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DocumentTypeElement != null) yield return DocumentTypeElement; - if (ReferenceElement != null) yield return ReferenceElement; - if (PublicationDateElement != null) yield return PublicationDateElement; - if (PresentationDateElement != null) yield return PresentationDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DocumentTypeElement != null) yield return new ElementValue("documentType", DocumentTypeElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - if (PublicationDateElement != null) yield return new ElementValue("publicationDate", PublicationDateElement); - if (PresentationDateElement != null) yield return new ElementValue("presentationDate", PresentationDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -480,7 +432,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -502,7 +454,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DocumentTypeElement is not null) yield return new KeyValuePair("documentType",DocumentTypeElement); @@ -655,31 +607,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Detail != null) yield return Detail; - if (ReportedElement != null) yield return ReportedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (ReportedElement != null) yield return new ElementValue("reported", ReportedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -698,7 +626,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -717,7 +645,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -889,35 +817,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SeriesElement != null) yield return SeriesElement; - if (Authority != null) yield return Authority; - foreach (var elem in TargetDisease) { if (elem != null) yield return elem; } - if (DoseNumber != null) yield return DoseNumber; - if (SeriesDoses != null) yield return SeriesDoses; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - foreach (var elem in TargetDisease) { if (elem != null) yield return new ElementValue("targetDisease", elem); } - if (DoseNumber != null) yield return new ElementValue("doseNumber", DoseNumber); - if (SeriesDoses != null) yield return new ElementValue("seriesDoses", SeriesDoses); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -942,7 +842,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -967,7 +867,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SeriesElement is not null) yield return new KeyValuePair("series",SeriesElement); @@ -1613,81 +1513,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (VaccineCode != null) yield return VaccineCode; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (RecordedElement != null) yield return RecordedElement; - if (PrimarySourceElement != null) yield return PrimarySourceElement; - if (ReportOrigin != null) yield return ReportOrigin; - if (Location != null) yield return Location; - if (Manufacturer != null) yield return Manufacturer; - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (DoseQuantity != null) yield return DoseQuantity; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (IsSubpotentElement != null) yield return IsSubpotentElement; - foreach (var elem in SubpotentReason) { if (elem != null) yield return elem; } - foreach (var elem in Education) { if (elem != null) yield return elem; } - foreach (var elem in ProgramEligibility) { if (elem != null) yield return elem; } - if (FundingSource != null) yield return FundingSource; - foreach (var elem in Reaction) { if (elem != null) yield return elem; } - foreach (var elem in ProtocolApplied) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (VaccineCode != null) yield return new ElementValue("vaccineCode", VaccineCode); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (PrimarySourceElement != null) yield return new ElementValue("primarySource", PrimarySourceElement); - if (ReportOrigin != null) yield return new ElementValue("reportOrigin", ReportOrigin); - if (Location != null) yield return new ElementValue("location", Location); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (DoseQuantity != null) yield return new ElementValue("doseQuantity", DoseQuantity); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (IsSubpotentElement != null) yield return new ElementValue("isSubpotent", IsSubpotentElement); - foreach (var elem in SubpotentReason) { if (elem != null) yield return new ElementValue("subpotentReason", elem); } - foreach (var elem in Education) { if (elem != null) yield return new ElementValue("education", elem); } - foreach (var elem in ProgramEligibility) { if (elem != null) yield return new ElementValue("programEligibility", elem); } - if (FundingSource != null) yield return new ElementValue("fundingSource", FundingSource); - foreach (var elem in Reaction) { if (elem != null) yield return new ElementValue("reaction", elem); } - foreach (var elem in ProtocolApplied) { if (elem != null) yield return new ElementValue("protocolApplied", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1781,7 +1607,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1875,7 +1701,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs index 0809b03c87..07ac424cde 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationEvaluation.cs @@ -424,51 +424,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (Authority != null) yield return Authority; - if (TargetDisease != null) yield return TargetDisease; - if (ImmunizationEvent != null) yield return ImmunizationEvent; - if (DoseStatus != null) yield return DoseStatus; - foreach (var elem in DoseStatusReason) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (SeriesElement != null) yield return SeriesElement; - if (DoseNumber != null) yield return DoseNumber; - if (SeriesDoses != null) yield return SeriesDoses; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - if (TargetDisease != null) yield return new ElementValue("targetDisease", TargetDisease); - if (ImmunizationEvent != null) yield return new ElementValue("immunizationEvent", ImmunizationEvent); - if (DoseStatus != null) yield return new ElementValue("doseStatus", DoseStatus); - foreach (var elem in DoseStatusReason) { if (elem != null) yield return new ElementValue("doseStatusReason", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (DoseNumber != null) yield return new ElementValue("doseNumber", DoseNumber); - if (SeriesDoses != null) yield return new ElementValue("seriesDoses", SeriesDoses); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -517,7 +473,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -566,7 +522,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs index 44002f099f..6898c8eb64 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ImmunizationRecommendation.cs @@ -359,49 +359,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in VaccineCode) { if (elem != null) yield return elem; } - if (TargetDisease != null) yield return TargetDisease; - foreach (var elem in ContraindicatedVaccineCode) { if (elem != null) yield return elem; } - if (ForecastStatus != null) yield return ForecastStatus; - foreach (var elem in ForecastReason) { if (elem != null) yield return elem; } - foreach (var elem in DateCriterion) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (SeriesElement != null) yield return SeriesElement; - if (DoseNumber != null) yield return DoseNumber; - if (SeriesDoses != null) yield return SeriesDoses; - foreach (var elem in SupportingImmunization) { if (elem != null) yield return elem; } - foreach (var elem in SupportingPatientInformation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in VaccineCode) { if (elem != null) yield return new ElementValue("vaccineCode", elem); } - if (TargetDisease != null) yield return new ElementValue("targetDisease", TargetDisease); - foreach (var elem in ContraindicatedVaccineCode) { if (elem != null) yield return new ElementValue("contraindicatedVaccineCode", elem); } - if (ForecastStatus != null) yield return new ElementValue("forecastStatus", ForecastStatus); - foreach (var elem in ForecastReason) { if (elem != null) yield return new ElementValue("forecastReason", elem); } - foreach (var elem in DateCriterion) { if (elem != null) yield return new ElementValue("dateCriterion", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (DoseNumber != null) yield return new ElementValue("doseNumber", DoseNumber); - if (SeriesDoses != null) yield return new ElementValue("seriesDoses", SeriesDoses); - foreach (var elem in SupportingImmunization) { if (elem != null) yield return new ElementValue("supportingImmunization", elem); } - foreach (var elem in SupportingPatientInformation) { if (elem != null) yield return new ElementValue("supportingPatientInformation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -447,7 +405,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -493,7 +451,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VaccineCode?.Any() == true) yield return new KeyValuePair("vaccineCode",VaccineCode); @@ -620,29 +578,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -658,7 +594,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -674,7 +610,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -830,35 +766,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (Authority != null) yield return Authority; - foreach (var elem in Recommendation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - foreach (var elem in Recommendation) { if (elem != null) yield return new ElementValue("recommendation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -883,7 +791,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -908,7 +816,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs index c2ea48e24c..b94bd358a9 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ImplementationGuide.cs @@ -2407,31 +2407,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UriElement != null) yield return UriElement; - if (PackageIdElement != null) yield return PackageIdElement; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (PackageIdElement != null) yield return new ElementValue("packageId", PackageIdElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2450,7 +2426,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2469,7 +2445,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UriElement is not null) yield return new KeyValuePair("uri",UriElement); @@ -2607,29 +2583,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ProfileElement != null) yield return ProfileElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2645,7 +2599,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2661,7 +2615,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2810,35 +2764,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Grouping) { if (elem != null) yield return elem; } - foreach (var elem in Resource) { if (elem != null) yield return elem; } - if (Page != null) yield return Page; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in Template) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Grouping) { if (elem != null) yield return new ElementValue("grouping", elem); } - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - if (Page != null) yield return new ElementValue("page", Page); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in Template) { if (elem != null) yield return new ElementValue("template", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2863,7 +2789,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2888,7 +2814,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Grouping?.Any() == true) yield return new KeyValuePair("grouping",Grouping); @@ -3025,29 +2951,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3063,7 +2967,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3079,7 +2983,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -3319,37 +3223,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - foreach (var elem in FhirVersionElement) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Example != null) yield return Example; - if (GroupingIdElement != null) yield return GroupingIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - foreach (var elem in FhirVersionElement) { if (elem != null) yield return new ElementValue("fhirVersion", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Example != null) yield return new ElementValue("example", Example); - if (GroupingIdElement != null) yield return new ElementValue("groupingId", GroupingIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3377,7 +3251,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3405,7 +3279,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -3583,33 +3457,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Name != null) yield return Name; - if (TitleElement != null) yield return TitleElement; - if (GenerationElement != null) yield return GenerationElement; - foreach (var elem in Page) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Name != null) yield return new ElementValue("name", Name); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (GenerationElement != null) yield return new ElementValue("generation", GenerationElement); - foreach (var elem in Page) { if (elem != null) yield return new ElementValue("page", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3631,7 +3479,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3653,7 +3501,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Name is not null) yield return new KeyValuePair("name",Name); @@ -3788,29 +3636,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3826,7 +3652,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3842,7 +3668,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -4007,31 +3833,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (SourceElement != null) yield return SourceElement; - if (ScopeElement != null) yield return ScopeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (ScopeElement != null) yield return new ElementValue("scope", ScopeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4050,7 +3852,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4069,7 +3871,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -4272,35 +4074,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RenderingElement != null) yield return RenderingElement; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - foreach (var elem in Page) { if (elem != null) yield return elem; } - foreach (var elem in ImageElement) { if (elem != null) yield return elem; } - foreach (var elem in OtherElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RenderingElement != null) yield return new ElementValue("rendering", RenderingElement); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - foreach (var elem in Page) { if (elem != null) yield return new ElementValue("page", elem); } - foreach (var elem in ImageElement) { if (elem != null) yield return new ElementValue("image", elem); } - foreach (var elem in OtherElement) { if (elem != null) yield return new ElementValue("other", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4325,7 +4099,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4350,7 +4124,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RenderingElement is not null) yield return new KeyValuePair("rendering",RenderingElement); @@ -4488,31 +4262,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - if (Example != null) yield return Example; - if (RelativePathElement != null) yield return RelativePathElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - if (Example != null) yield return new ElementValue("example", Example); - if (RelativePathElement != null) yield return new ElementValue("relativePath", RelativePathElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4531,7 +4281,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4550,7 +4300,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -4719,31 +4469,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in AnchorElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in AnchorElement) { if (elem != null) yield return new ElementValue("anchor", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4762,7 +4488,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4781,7 +4507,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -5401,65 +5127,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (PackageIdElement != null) yield return PackageIdElement; - if (LicenseElement != null) yield return LicenseElement; - foreach (var elem in FhirVersionElement) { if (elem != null) yield return elem; } - foreach (var elem in DependsOn) { if (elem != null) yield return elem; } - foreach (var elem in Global) { if (elem != null) yield return elem; } - if (Definition != null) yield return Definition; - if (Manifest != null) yield return Manifest; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (PackageIdElement != null) yield return new ElementValue("packageId", PackageIdElement); - if (LicenseElement != null) yield return new ElementValue("license", LicenseElement); - foreach (var elem in FhirVersionElement) { if (elem != null) yield return new ElementValue("fhirVersion", elem); } - foreach (var elem in DependsOn) { if (elem != null) yield return new ElementValue("dependsOn", elem); } - foreach (var elem in Global) { if (elem != null) yield return new ElementValue("global", elem); } - if (Definition != null) yield return new ElementValue("definition", Definition); - if (Manifest != null) yield return new ElementValue("manifest", Manifest); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5529,7 +5197,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5599,7 +5267,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs b/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs index 5ed90be07c..6d2cebfc0f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Ingredient.cs @@ -194,29 +194,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RoleElement != null) yield return RoleElement; - if (Manufacturer != null) yield return Manufacturer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RoleElement != null) yield return new ElementValue("role", RoleElement); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -232,7 +210,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -248,7 +226,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RoleElement is not null) yield return new KeyValuePair("role",RoleElement); @@ -344,29 +322,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Strength) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Strength) { if (elem != null) yield return new ElementValue("strength", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -382,7 +338,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -398,7 +354,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -635,39 +591,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Presentation != null) yield return Presentation; - if (TextPresentationElement != null) yield return TextPresentationElement; - if (Concentration != null) yield return Concentration; - if (TextConcentrationElement != null) yield return TextConcentrationElement; - if (MeasurementPointElement != null) yield return MeasurementPointElement; - foreach (var elem in Country) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceStrength) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Presentation != null) yield return new ElementValue("presentation", Presentation); - if (TextPresentationElement != null) yield return new ElementValue("textPresentation", TextPresentationElement); - if (Concentration != null) yield return new ElementValue("concentration", Concentration); - if (TextConcentrationElement != null) yield return new ElementValue("textConcentration", TextConcentrationElement); - if (MeasurementPointElement != null) yield return new ElementValue("measurementPoint", MeasurementPointElement); - foreach (var elem in Country) { if (elem != null) yield return new ElementValue("country", elem); } - foreach (var elem in ReferenceStrength) { if (elem != null) yield return new ElementValue("referenceStrength", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -698,7 +622,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -729,7 +653,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Presentation is not null) yield return new KeyValuePair("presentation",Presentation); @@ -886,33 +810,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - if (Strength != null) yield return Strength; - if (MeasurementPointElement != null) yield return MeasurementPointElement; - foreach (var elem in Country) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - if (Strength != null) yield return new ElementValue("strength", Strength); - if (MeasurementPointElement != null) yield return new ElementValue("measurementPoint", MeasurementPointElement); - foreach (var elem in Country) { if (elem != null) yield return new ElementValue("country", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -934,7 +832,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -956,7 +854,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -1184,41 +1082,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in For) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - foreach (var elem in Function) { if (elem != null) yield return elem; } - if (AllergenicIndicatorElement != null) yield return AllergenicIndicatorElement; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - if (Substance != null) yield return Substance; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in For) { if (elem != null) yield return new ElementValue("for", elem); } - if (Role != null) yield return new ElementValue("role", Role); - foreach (var elem in Function) { if (elem != null) yield return new ElementValue("function", elem); } - if (AllergenicIndicatorElement != null) yield return new ElementValue("allergenicIndicator", AllergenicIndicatorElement); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - if (Substance != null) yield return new ElementValue("substance", Substance); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1252,7 +1116,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1286,7 +1150,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs index 181a7aabc3..192b884e01 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/InsurancePlan.cs @@ -206,33 +206,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Purpose != null) yield return Purpose; - if (Name != null) yield return Name; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Purpose != null) yield return new ElementValue("purpose", Purpose); - if (Name != null) yield return new ElementValue("name", Name); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -254,7 +228,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -276,7 +250,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Purpose is not null) yield return new KeyValuePair("purpose",Purpose); @@ -395,31 +369,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in Benefit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in Benefit) { if (elem != null) yield return new ElementValue("benefit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -438,7 +388,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -457,7 +407,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -590,31 +540,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (RequirementElement != null) yield return RequirementElement; - foreach (var elem in Limit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (RequirementElement != null) yield return new ElementValue("requirement", RequirementElement); - foreach (var elem in Limit) { if (elem != null) yield return new ElementValue("limit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -633,7 +559,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -652,7 +578,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -749,29 +675,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -787,7 +691,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -803,7 +707,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -972,37 +876,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in GeneralCost) { if (elem != null) yield return elem; } - foreach (var elem in SpecificCost) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in GeneralCost) { if (elem != null) yield return new ElementValue("generalCost", elem); } - foreach (var elem in SpecificCost) { if (elem != null) yield return new ElementValue("specificCost", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1030,7 +904,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1058,7 +932,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1226,33 +1100,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (GroupSizeElement != null) yield return GroupSizeElement; - if (Cost != null) yield return Cost; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (GroupSizeElement != null) yield return new ElementValue("groupSize", GroupSizeElement); - if (Cost != null) yield return new ElementValue("cost", Cost); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1274,7 +1122,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1296,7 +1144,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1396,29 +1244,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - foreach (var elem in Benefit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - foreach (var elem in Benefit) { if (elem != null) yield return new ElementValue("benefit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1434,7 +1260,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1450,7 +1276,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -1548,29 +1374,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Cost) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Cost) { if (elem != null) yield return new ElementValue("cost", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1586,7 +1390,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1602,7 +1406,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1733,33 +1537,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Applicability != null) yield return Applicability; - foreach (var elem in Qualifiers) { if (elem != null) yield return elem; } - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Applicability != null) yield return new ElementValue("applicability", Applicability); - foreach (var elem in Qualifiers) { if (elem != null) yield return new ElementValue("qualifiers", elem); } - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1781,7 +1559,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1803,7 +1581,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2155,53 +1933,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (OwnedBy != null) yield return OwnedBy; - if (AdministeredBy != null) yield return AdministeredBy; - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in Coverage) { if (elem != null) yield return elem; } - foreach (var elem in Plan) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (OwnedBy != null) yield return new ElementValue("ownedBy", OwnedBy); - if (AdministeredBy != null) yield return new ElementValue("administeredBy", AdministeredBy); - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in Coverage) { if (elem != null) yield return new ElementValue("coverage", elem); } - foreach (var elem in Plan) { if (elem != null) yield return new ElementValue("plan", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2253,7 +1985,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2305,7 +2037,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs index a7b308e03c..46a36f3c56 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Invoice.cs @@ -189,29 +189,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -227,7 +205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -243,7 +221,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -378,31 +356,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (ChargeItem != null) yield return ChargeItem; - foreach (var elem in PriceComponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (ChargeItem != null) yield return new ElementValue("chargeItem", ChargeItem); - foreach (var elem in PriceComponent) { if (elem != null) yield return new ElementValue("priceComponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -421,7 +375,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -440,7 +394,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -608,33 +562,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Code != null) yield return Code; - if (FactorElement != null) yield return FactorElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Code != null) yield return new ElementValue("code", Code); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -656,7 +584,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -678,7 +606,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1074,57 +1002,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CancelledReasonElement != null) yield return CancelledReasonElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (Recipient != null) yield return Recipient; - if (DateElement != null) yield return DateElement; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Issuer != null) yield return Issuer; - if (Account != null) yield return Account; - foreach (var elem in LineItem) { if (elem != null) yield return elem; } - foreach (var elem in TotalPriceComponent) { if (elem != null) yield return elem; } - if (TotalNet != null) yield return TotalNet; - if (TotalGross != null) yield return TotalGross; - if (PaymentTermsElement != null) yield return PaymentTermsElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CancelledReasonElement != null) yield return new ElementValue("cancelledReason", CancelledReasonElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Recipient != null) yield return new ElementValue("recipient", Recipient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Issuer != null) yield return new ElementValue("issuer", Issuer); - if (Account != null) yield return new ElementValue("account", Account); - foreach (var elem in LineItem) { if (elem != null) yield return new ElementValue("lineItem", elem); } - foreach (var elem in TotalPriceComponent) { if (elem != null) yield return new ElementValue("totalPriceComponent", elem); } - if (TotalNet != null) yield return new ElementValue("totalNet", TotalNet); - if (TotalGross != null) yield return new ElementValue("totalGross", TotalGross); - if (PaymentTermsElement != null) yield return new ElementValue("paymentTerms", PaymentTermsElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1182,7 +1060,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1240,7 +1118,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Library.cs b/src/Hl7.Fhir.R4B/Model/Generated/Library.cs index c25a491377..54f37a1b06 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Library.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Library.cs @@ -890,87 +890,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in DataRequirement) { if (elem != null) yield return elem; } - foreach (var elem in Content) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in DataRequirement) { if (elem != null) yield return new ElementValue("dataRequirement", elem); } - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1073,7 +993,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1176,7 +1096,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs index 583b2a2828..fd75357920 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Linkage.cs @@ -198,29 +198,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -236,7 +214,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -252,7 +230,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -369,31 +347,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActiveElement != null) yield return ActiveElement; - if (Author != null) yield return Author; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -412,7 +366,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -431,7 +385,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActiveElement is not null) yield return new KeyValuePair("active",ActiveElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/List.cs b/src/Hl7.Fhir.R4B/Model/Generated/List.cs index 7c9776ad35..2549626e4d 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/List.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/List.cs @@ -244,33 +244,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Flag != null) yield return Flag; - if (DeletedElement != null) yield return DeletedElement; - if (DateElement != null) yield return DateElement; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Flag != null) yield return new ElementValue("flag", Flag); - if (DeletedElement != null) yield return new ElementValue("deleted", DeletedElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -292,7 +266,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -314,7 +288,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Flag is not null) yield return new KeyValuePair("flag",Flag); @@ -664,51 +638,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ModeElement != null) yield return ModeElement; - if (TitleElement != null) yield return TitleElement; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - if (Source != null) yield return Source; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Entry) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Source != null) yield return new ElementValue("source", Source); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -757,7 +687,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -806,7 +736,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Location.cs b/src/Hl7.Fhir.R4B/Model/Generated/Location.cs index f53fa42184..d222342ca8 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Location.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Location.cs @@ -268,31 +268,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LongitudeElement != null) yield return LongitudeElement; - if (LatitudeElement != null) yield return LatitudeElement; - if (AltitudeElement != null) yield return AltitudeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LongitudeElement != null) yield return new ElementValue("longitude", LongitudeElement); - if (LatitudeElement != null) yield return new ElementValue("latitude", LatitudeElement); - if (AltitudeElement != null) yield return new ElementValue("altitude", AltitudeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -311,7 +287,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -330,7 +306,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LongitudeElement is not null) yield return new KeyValuePair("longitude",LongitudeElement); @@ -535,33 +511,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return elem; } - if (AllDayElement != null) yield return AllDayElement; - if (OpeningTimeElement != null) yield return OpeningTimeElement; - if (ClosingTimeElement != null) yield return ClosingTimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return new ElementValue("daysOfWeek", elem); } - if (AllDayElement != null) yield return new ElementValue("allDay", AllDayElement); - if (OpeningTimeElement != null) yield return new ElementValue("openingTime", OpeningTimeElement); - if (ClosingTimeElement != null) yield return new ElementValue("closingTime", ClosingTimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -583,7 +533,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -605,7 +555,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DaysOfWeekElement?.Any() == true) yield return new KeyValuePair("daysOfWeek",DaysOfWeekElement); @@ -1056,59 +1006,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (OperationalStatus != null) yield return OperationalStatus; - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (ModeElement != null) yield return ModeElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - if (PhysicalType != null) yield return PhysicalType; - if (Position != null) yield return Position; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (PartOf != null) yield return PartOf; - foreach (var elem in HoursOfOperation) { if (elem != null) yield return elem; } - if (AvailabilityExceptionsElement != null) yield return AvailabilityExceptionsElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (OperationalStatus != null) yield return new ElementValue("operationalStatus", OperationalStatus); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - if (PhysicalType != null) yield return new ElementValue("physicalType", PhysicalType); - if (Position != null) yield return new ElementValue("position", Position); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - foreach (var elem in HoursOfOperation) { if (elem != null) yield return new ElementValue("hoursOfOperation", elem); } - if (AvailabilityExceptionsElement != null) yield return new ElementValue("availabilityExceptions", AvailabilityExceptionsElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1169,7 +1067,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1230,7 +1128,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs index 050952c0e2..1207cfc18c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ManufacturedItemDefinition.cs @@ -144,29 +144,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -182,7 +160,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -198,7 +176,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -391,39 +369,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ManufacturedDoseForm != null) yield return ManufacturedDoseForm; - if (UnitOfPresentation != null) yield return UnitOfPresentation; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ManufacturedDoseForm != null) yield return new ElementValue("manufacturedDoseForm", ManufacturedDoseForm); - if (UnitOfPresentation != null) yield return new ElementValue("unitOfPresentation", UnitOfPresentation); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -454,7 +400,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -485,7 +431,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MarketingStatus.cs b/src/Hl7.Fhir.R4B/Model/Generated/MarketingStatus.cs index f56662f0e6..b24826d392 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MarketingStatus.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MarketingStatus.cs @@ -194,35 +194,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Country != null) yield return Country; - if (Jurisdiction != null) yield return Jurisdiction; - if (Status != null) yield return Status; - if (DateRange != null) yield return DateRange; - if (RestoreDateElement != null) yield return RestoreDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Country != null) yield return new ElementValue("country", Country); - if (Jurisdiction != null) yield return new ElementValue("jurisdiction", Jurisdiction); - if (Status != null) yield return new ElementValue("status", Status); - if (DateRange != null) yield return new ElementValue("dateRange", DateRange); - if (RestoreDateElement != null) yield return new ElementValue("restoreDate", RestoreDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -247,7 +219,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -272,7 +244,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Country is not null) yield return new KeyValuePair("country",Country); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs b/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs index 118018889f..c11472d04c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Measure.cs @@ -199,33 +199,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Population) { if (elem != null) yield return elem; } - foreach (var elem in Stratifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - foreach (var elem in Stratifier) { if (elem != null) yield return new ElementValue("stratifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -247,7 +221,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -269,7 +243,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -403,31 +377,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -446,7 +396,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -465,7 +415,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -614,33 +564,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -662,7 +586,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -684,7 +608,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -819,31 +743,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -862,7 +762,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -881,7 +781,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1033,33 +933,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Usage) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Usage) { if (elem != null) yield return new ElementValue("usage", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1081,7 +955,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1103,7 +977,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -2253,107 +2127,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (DisclaimerElement != null) yield return DisclaimerElement; - if (Scoring != null) yield return Scoring; - if (CompositeScoring != null) yield return CompositeScoring; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (RiskAdjustmentElement != null) yield return RiskAdjustmentElement; - if (RateAggregationElement != null) yield return RateAggregationElement; - if (RationaleElement != null) yield return RationaleElement; - if (ClinicalRecommendationStatementElement != null) yield return ClinicalRecommendationStatementElement; - if (ImprovementNotation != null) yield return ImprovementNotation; - foreach (var elem in DefinitionElement) { if (elem != null) yield return elem; } - if (GuidanceElement != null) yield return GuidanceElement; - foreach (var elem in Group) { if (elem != null) yield return elem; } - foreach (var elem in SupplementalData) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (DisclaimerElement != null) yield return new ElementValue("disclaimer", DisclaimerElement); - if (Scoring != null) yield return new ElementValue("scoring", Scoring); - if (CompositeScoring != null) yield return new ElementValue("compositeScoring", CompositeScoring); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (RiskAdjustmentElement != null) yield return new ElementValue("riskAdjustment", RiskAdjustmentElement); - if (RateAggregationElement != null) yield return new ElementValue("rateAggregation", RateAggregationElement); - if (RationaleElement != null) yield return new ElementValue("rationale", RationaleElement); - if (ClinicalRecommendationStatementElement != null) yield return new ElementValue("clinicalRecommendationStatement", ClinicalRecommendationStatementElement); - if (ImprovementNotation != null) yield return new ElementValue("improvementNotation", ImprovementNotation); - foreach (var elem in DefinitionElement) { if (elem != null) yield return new ElementValue("definition", elem); } - if (GuidanceElement != null) yield return new ElementValue("guidance", GuidanceElement); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - foreach (var elem in SupplementalData) { if (elem != null) yield return new ElementValue("supplementalData", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2486,7 +2260,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2619,7 +2393,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs index 6b6ffc00d4..613fca4d59 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MeasureReport.cs @@ -243,33 +243,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Population) { if (elem != null) yield return elem; } - if (MeasureScore != null) yield return MeasureScore; - foreach (var elem in Stratifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - if (MeasureScore != null) yield return new ElementValue("measureScore", MeasureScore); - foreach (var elem in Stratifier) { if (elem != null) yield return new ElementValue("stratifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -291,7 +265,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -313,7 +287,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -448,31 +422,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (CountElement != null) yield return CountElement; - if (SubjectResults != null) yield return SubjectResults; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (SubjectResults != null) yield return new ElementValue("subjectResults", SubjectResults); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -491,7 +441,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -510,7 +460,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -610,29 +560,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Stratum) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Stratum) { if (elem != null) yield return new ElementValue("stratum", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -648,7 +576,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -664,7 +592,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -795,33 +723,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - foreach (var elem in Component) { if (elem != null) yield return elem; } - foreach (var elem in Population) { if (elem != null) yield return elem; } - if (MeasureScore != null) yield return MeasureScore; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - if (MeasureScore != null) yield return new ElementValue("measureScore", MeasureScore); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -843,7 +745,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -865,7 +767,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -967,29 +869,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1005,7 +885,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1021,7 +901,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1154,31 +1034,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (CountElement != null) yield return CountElement; - if (SubjectResults != null) yield return SubjectResults; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (SubjectResults != null) yield return new ElementValue("subjectResults", SubjectResults); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1197,7 +1053,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1216,7 +1072,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1533,47 +1389,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (TypeElement != null) yield return TypeElement; - if (MeasureElement != null) yield return MeasureElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (Reporter != null) yield return Reporter; - if (Period != null) yield return Period; - if (ImprovementNotation != null) yield return ImprovementNotation; - foreach (var elem in Group) { if (elem != null) yield return elem; } - foreach (var elem in EvaluatedResource) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (MeasureElement != null) yield return new ElementValue("measure", MeasureElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Reporter != null) yield return new ElementValue("reporter", Reporter); - if (Period != null) yield return new ElementValue("period", Period); - if (ImprovementNotation != null) yield return new ElementValue("improvementNotation", ImprovementNotation); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - foreach (var elem in EvaluatedResource) { if (elem != null) yield return new ElementValue("evaluatedResource", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1616,7 +1432,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1659,7 +1475,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Media.cs b/src/Hl7.Fhir.R4B/Model/Generated/Media.cs index a02bb88dca..1917382057 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Media.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Media.cs @@ -603,69 +603,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Modality != null) yield return Modality; - if (View != null) yield return View; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Created != null) yield return Created; - if (IssuedElement != null) yield return IssuedElement; - if (Operator != null) yield return Operator; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (DeviceNameElement != null) yield return DeviceNameElement; - if (Device != null) yield return Device; - if (HeightElement != null) yield return HeightElement; - if (WidthElement != null) yield return WidthElement; - if (FramesElement != null) yield return FramesElement; - if (DurationElement != null) yield return DurationElement; - if (Content != null) yield return Content; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Modality != null) yield return new ElementValue("modality", Modality); - if (View != null) yield return new ElementValue("view", View); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Created != null) yield return new ElementValue("created", Created); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Operator != null) yield return new ElementValue("operator", Operator); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (DeviceNameElement != null) yield return new ElementValue("deviceName", DeviceNameElement); - if (Device != null) yield return new ElementValue("device", Device); - if (HeightElement != null) yield return new ElementValue("height", HeightElement); - if (WidthElement != null) yield return new ElementValue("width", WidthElement); - if (FramesElement != null) yield return new ElementValue("frames", FramesElement); - if (DurationElement != null) yield return new ElementValue("duration", DurationElement); - if (Content != null) yield return new ElementValue("content", Content); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -741,7 +679,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -817,7 +755,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs b/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs index e393717904..4f634fa4bf 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Medication.cs @@ -213,31 +213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (IsActiveElement != null) yield return IsActiveElement; - if (Strength != null) yield return Strength; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (IsActiveElement != null) yield return new ElementValue("isActive", IsActiveElement); - if (Strength != null) yield return new ElementValue("strength", Strength); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -256,7 +232,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -275,7 +251,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -408,29 +384,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -446,7 +400,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -462,7 +416,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LotNumberElement is not null) yield return new KeyValuePair("lotNumber",LotNumberElement); @@ -666,41 +620,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (StatusElement != null) yield return StatusElement; - if (Manufacturer != null) yield return Manufacturer; - if (Form != null) yield return Form; - if (Amount != null) yield return Amount; - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - if (Batch != null) yield return Batch; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - if (Form != null) yield return new ElementValue("form", Form); - if (Amount != null) yield return new ElementValue("amount", Amount); - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - if (Batch != null) yield return new ElementValue("batch", Batch); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -734,7 +654,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -768,7 +688,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs index 4a4f747a6e..9fb26b5484 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationAdministration.cs @@ -202,29 +202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -240,7 +218,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -256,7 +234,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -439,37 +417,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TextElement != null) yield return TextElement; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (Method != null) yield return Method; - if (Dose != null) yield return Dose; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (Method != null) yield return new ElementValue("method", Method); - if (Dose != null) yield return new ElementValue("dose", Dose); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -497,7 +445,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -525,7 +473,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TextElement is not null) yield return new KeyValuePair("text",TextElement); @@ -961,63 +909,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusReason) { if (elem != null) yield return elem; } - if (Category != null) yield return Category; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (Effective != null) yield return Effective; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (Request != null) yield return Request; - foreach (var elem in Device) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Dosage != null) yield return Dosage; - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return new ElementValue("instantiates", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusReason) { if (elem != null) yield return new ElementValue("statusReason", elem); } - if (Category != null) yield return new ElementValue("category", Category); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (Effective != null) yield return new ElementValue("effective", Effective); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (Request != null) yield return new ElementValue("request", Request); - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Dosage != null) yield return new ElementValue("dosage", Dosage); - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1084,7 +976,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1151,7 +1043,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs index b11a9738b7..88ba06f699 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationDispense.cs @@ -214,29 +214,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -252,7 +230,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -268,7 +246,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -421,33 +399,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (WasSubstitutedElement != null) yield return WasSubstitutedElement; - if (Type != null) yield return Type; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in ResponsibleParty) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (WasSubstitutedElement != null) yield return new ElementValue("wasSubstituted", WasSubstitutedElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in ResponsibleParty) { if (elem != null) yield return new ElementValue("responsibleParty", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -469,7 +421,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -491,7 +443,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (WasSubstitutedElement is not null) yield return new KeyValuePair("wasSubstituted",WasSubstitutedElement); @@ -1025,73 +977,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (Category != null) yield return Category; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in AuthorizingPrescription) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - if (DaysSupply != null) yield return DaysSupply; - if (WhenPreparedElement != null) yield return WhenPreparedElement; - if (WhenHandedOverElement != null) yield return WhenHandedOverElement; - if (Destination != null) yield return Destination; - foreach (var elem in Receiver) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in DosageInstruction) { if (elem != null) yield return elem; } - if (Substitution != null) yield return Substitution; - foreach (var elem in DetectedIssue) { if (elem != null) yield return elem; } - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (Category != null) yield return new ElementValue("category", Category); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in AuthorizingPrescription) { if (elem != null) yield return new ElementValue("authorizingPrescription", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (DaysSupply != null) yield return new ElementValue("daysSupply", DaysSupply); - if (WhenPreparedElement != null) yield return new ElementValue("whenPrepared", WhenPreparedElement); - if (WhenHandedOverElement != null) yield return new ElementValue("whenHandedOver", WhenHandedOverElement); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Receiver) { if (elem != null) yield return new ElementValue("receiver", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in DosageInstruction) { if (elem != null) yield return new ElementValue("dosageInstruction", elem); } - if (Substitution != null) yield return new ElementValue("substitution", Substitution); - foreach (var elem in DetectedIssue) { if (elem != null) yield return new ElementValue("detectedIssue", elem); } - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1173,7 +1059,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1255,7 +1141,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs index bccc859bcd..483fbd203b 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationKnowledge.cs @@ -178,29 +178,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Reference) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Reference) { if (elem != null) yield return new ElementValue("reference", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -216,7 +194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -232,7 +210,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -327,29 +305,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Source != null) yield return Source; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Source != null) yield return new ElementValue("source", Source); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -365,7 +321,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -381,7 +337,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -515,31 +471,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (IsActiveElement != null) yield return IsActiveElement; - if (Strength != null) yield return Strength; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (IsActiveElement != null) yield return new ElementValue("isActive", IsActiveElement); - if (Strength != null) yield return new ElementValue("strength", Strength); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -558,7 +490,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -577,7 +509,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -710,31 +642,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (SourceElement != null) yield return SourceElement; - if (Cost != null) yield return Cost; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (Cost != null) yield return new ElementValue("cost", Cost); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -753,7 +661,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -772,7 +680,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -887,29 +795,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (NameElement != null) yield return NameElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (NameElement != null) yield return new ElementValue("name", NameElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -925,7 +811,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -941,7 +827,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1058,31 +944,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - if (Indication != null) yield return Indication; - foreach (var elem in PatientCharacteristics) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - if (Indication != null) yield return new ElementValue("indication", Indication); - foreach (var elem in PatientCharacteristics) { if (elem != null) yield return new ElementValue("patientCharacteristics", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1101,7 +963,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1120,7 +982,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Dosage?.Any() == true) yield return new KeyValuePair("dosage",Dosage); @@ -1216,29 +1078,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1254,7 +1094,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1270,7 +1110,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1388,29 +1228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Characteristic != null) yield return Characteristic; - foreach (var elem in ValueElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Characteristic != null) yield return new ElementValue("characteristic", Characteristic); - foreach (var elem in ValueElement) { if (elem != null) yield return new ElementValue("value", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1426,7 +1244,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1442,7 +1260,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Characteristic is not null) yield return new KeyValuePair("characteristic",Characteristic); @@ -1537,29 +1355,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Classification) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1575,7 +1371,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1591,7 +1387,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1688,29 +1484,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1726,7 +1500,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1742,7 +1516,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1841,29 +1615,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1879,7 +1631,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1895,7 +1647,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2025,33 +1777,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RegulatoryAuthority != null) yield return RegulatoryAuthority; - foreach (var elem in Substitution) { if (elem != null) yield return elem; } - foreach (var elem in Schedule) { if (elem != null) yield return elem; } - if (MaxDispense != null) yield return MaxDispense; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RegulatoryAuthority != null) yield return new ElementValue("regulatoryAuthority", RegulatoryAuthority); - foreach (var elem in Substitution) { if (elem != null) yield return new ElementValue("substitution", elem); } - foreach (var elem in Schedule) { if (elem != null) yield return new ElementValue("schedule", elem); } - if (MaxDispense != null) yield return new ElementValue("maxDispense", MaxDispense); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2073,7 +1799,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2095,7 +1821,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RegulatoryAuthority is not null) yield return new KeyValuePair("regulatoryAuthority",RegulatoryAuthority); @@ -2210,29 +1936,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (AllowedElement != null) yield return AllowedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (AllowedElement != null) yield return new ElementValue("allowed", AllowedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2248,7 +1952,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2264,7 +1968,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2342,27 +2046,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Schedule != null) yield return Schedule; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2375,7 +2059,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2388,7 +2072,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Schedule is not null) yield return new KeyValuePair("schedule",Schedule); @@ -2481,29 +2165,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2519,7 +2181,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2535,7 +2197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -2646,31 +2308,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in AreaUnderCurve) { if (elem != null) yield return elem; } - foreach (var elem in LethalDose50) { if (elem != null) yield return elem; } - if (HalfLifePeriod != null) yield return HalfLifePeriod; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in AreaUnderCurve) { if (elem != null) yield return new ElementValue("areaUnderCurve", elem); } - foreach (var elem in LethalDose50) { if (elem != null) yield return new ElementValue("lethalDose50", elem); } - if (HalfLifePeriod != null) yield return new ElementValue("halfLifePeriod", HalfLifePeriod); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2689,7 +2327,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2708,7 +2346,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AreaUnderCurve?.Any() == true) yield return new KeyValuePair("areaUnderCurve",AreaUnderCurve); @@ -3189,69 +2827,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (StatusElement != null) yield return StatusElement; - if (Manufacturer != null) yield return Manufacturer; - if (DoseForm != null) yield return DoseForm; - if (Amount != null) yield return Amount; - foreach (var elem in SynonymElement) { if (elem != null) yield return elem; } - foreach (var elem in RelatedMedicationKnowledge) { if (elem != null) yield return elem; } - foreach (var elem in AssociatedMedication) { if (elem != null) yield return elem; } - foreach (var elem in ProductType) { if (elem != null) yield return elem; } - foreach (var elem in Monograph) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - if (PreparationInstructionElement != null) yield return PreparationInstructionElement; - foreach (var elem in IntendedRoute) { if (elem != null) yield return elem; } - foreach (var elem in Cost) { if (elem != null) yield return elem; } - foreach (var elem in MonitoringProgram) { if (elem != null) yield return elem; } - foreach (var elem in AdministrationGuidelines) { if (elem != null) yield return elem; } - foreach (var elem in MedicineClassification) { if (elem != null) yield return elem; } - if (Packaging != null) yield return Packaging; - foreach (var elem in DrugCharacteristic) { if (elem != null) yield return elem; } - foreach (var elem in Contraindication) { if (elem != null) yield return elem; } - foreach (var elem in Regulatory) { if (elem != null) yield return elem; } - foreach (var elem in Kinetics) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - if (DoseForm != null) yield return new ElementValue("doseForm", DoseForm); - if (Amount != null) yield return new ElementValue("amount", Amount); - foreach (var elem in SynonymElement) { if (elem != null) yield return new ElementValue("synonym", elem); } - foreach (var elem in RelatedMedicationKnowledge) { if (elem != null) yield return new ElementValue("relatedMedicationKnowledge", elem); } - foreach (var elem in AssociatedMedication) { if (elem != null) yield return new ElementValue("associatedMedication", elem); } - foreach (var elem in ProductType) { if (elem != null) yield return new ElementValue("productType", elem); } - foreach (var elem in Monograph) { if (elem != null) yield return new ElementValue("monograph", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - if (PreparationInstructionElement != null) yield return new ElementValue("preparationInstruction", PreparationInstructionElement); - foreach (var elem in IntendedRoute) { if (elem != null) yield return new ElementValue("intendedRoute", elem); } - foreach (var elem in Cost) { if (elem != null) yield return new ElementValue("cost", elem); } - foreach (var elem in MonitoringProgram) { if (elem != null) yield return new ElementValue("monitoringProgram", elem); } - foreach (var elem in AdministrationGuidelines) { if (elem != null) yield return new ElementValue("administrationGuidelines", elem); } - foreach (var elem in MedicineClassification) { if (elem != null) yield return new ElementValue("medicineClassification", elem); } - if (Packaging != null) yield return new ElementValue("packaging", Packaging); - foreach (var elem in DrugCharacteristic) { if (elem != null) yield return new ElementValue("drugCharacteristic", elem); } - foreach (var elem in Contraindication) { if (elem != null) yield return new ElementValue("contraindication", elem); } - foreach (var elem in Regulatory) { if (elem != null) yield return new ElementValue("regulatory", elem); } - foreach (var elem in Kinetics) { if (elem != null) yield return new ElementValue("kinetics", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3327,7 +2903,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3403,7 +2979,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs index 3ff6cfeaab..8d5464f510 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationRequest.cs @@ -362,39 +362,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (InitialFill != null) yield return InitialFill; - if (DispenseInterval != null) yield return DispenseInterval; - if (ValidityPeriod != null) yield return ValidityPeriod; - if (NumberOfRepeatsAllowedElement != null) yield return NumberOfRepeatsAllowedElement; - if (Quantity != null) yield return Quantity; - if (ExpectedSupplyDuration != null) yield return ExpectedSupplyDuration; - if (Performer != null) yield return Performer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (InitialFill != null) yield return new ElementValue("initialFill", InitialFill); - if (DispenseInterval != null) yield return new ElementValue("dispenseInterval", DispenseInterval); - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - if (NumberOfRepeatsAllowedElement != null) yield return new ElementValue("numberOfRepeatsAllowed", NumberOfRepeatsAllowedElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (ExpectedSupplyDuration != null) yield return new ElementValue("expectedSupplyDuration", ExpectedSupplyDuration); - if (Performer != null) yield return new ElementValue("performer", Performer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -425,7 +393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -456,7 +424,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (InitialFill is not null) yield return new KeyValuePair("initialFill",InitialFill); @@ -558,29 +526,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Duration != null) yield return Duration; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Duration != null) yield return new ElementValue("duration", Duration); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -596,7 +542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -612,7 +558,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -713,29 +659,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Allowed != null) yield return Allowed; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -751,7 +675,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -767,7 +691,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Allowed is not null) yield return new KeyValuePair("allowed",Allowed); @@ -1514,89 +1438,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Reported != null) yield return Reported; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (Performer != null) yield return Performer; - if (PerformerType != null) yield return PerformerType; - if (Recorder != null) yield return Recorder; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (CourseOfTherapyType != null) yield return CourseOfTherapyType; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in DosageInstruction) { if (elem != null) yield return elem; } - if (DispenseRequest != null) yield return DispenseRequest; - if (Substitution != null) yield return Substitution; - if (PriorPrescription != null) yield return PriorPrescription; - foreach (var elem in DetectedIssue) { if (elem != null) yield return elem; } - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Reported != null) yield return new ElementValue("reported", Reported); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (Performer != null) yield return new ElementValue("performer", Performer); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (CourseOfTherapyType != null) yield return new ElementValue("courseOfTherapyType", CourseOfTherapyType); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in DosageInstruction) { if (elem != null) yield return new ElementValue("dosageInstruction", elem); } - if (DispenseRequest != null) yield return new ElementValue("dispenseRequest", DispenseRequest); - if (Substitution != null) yield return new ElementValue("substitution", Substitution); - if (PriorPrescription != null) yield return new ElementValue("priorPrescription", PriorPrescription); - foreach (var elem in DetectedIssue) { if (elem != null) yield return new ElementValue("detectedIssue", elem); } - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1702,7 +1544,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1808,7 +1650,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs index d61e52c32c..db3e11456c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicationStatement.cs @@ -514,59 +514,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusReason) { if (elem != null) yield return elem; } - if (Category != null) yield return Category; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Effective != null) yield return Effective; - if (DateAssertedElement != null) yield return DateAssertedElement; - if (InformationSource != null) yield return InformationSource; - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusReason) { if (elem != null) yield return new ElementValue("statusReason", elem); } - if (Category != null) yield return new ElementValue("category", Category); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (DateAssertedElement != null) yield return new ElementValue("dateAsserted", DateAssertedElement); - if (InformationSource != null) yield return new ElementValue("informationSource", InformationSource); - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -627,7 +575,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -688,7 +636,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs index e8d21e36fb..e8cfa1439d 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MedicinalProductDefinition.cs @@ -147,29 +147,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Contact != null) yield return Contact; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Contact != null) yield return new ElementValue("contact", Contact); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -185,7 +163,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -201,7 +179,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -348,33 +326,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductNameElement != null) yield return ProductNameElement; - if (Type != null) yield return Type; - foreach (var elem in NamePart) { if (elem != null) yield return elem; } - foreach (var elem in CountryLanguage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductNameElement != null) yield return new ElementValue("productName", ProductNameElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in NamePart) { if (elem != null) yield return new ElementValue("namePart", elem); } - foreach (var elem in CountryLanguage) { if (elem != null) yield return new ElementValue("countryLanguage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -396,7 +348,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -418,7 +370,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductNameElement is not null) yield return new KeyValuePair("productName",ProductNameElement); @@ -534,29 +486,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PartElement != null) yield return PartElement; - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PartElement != null) yield return new ElementValue("part", PartElement); - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -572,7 +502,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -588,7 +518,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PartElement is not null) yield return new KeyValuePair("part",PartElement); @@ -705,31 +635,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Country != null) yield return Country; - if (Jurisdiction != null) yield return Jurisdiction; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Country != null) yield return new ElementValue("country", Country); - if (Jurisdiction != null) yield return new ElementValue("jurisdiction", Jurisdiction); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -748,7 +654,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -767,7 +673,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Country is not null) yield return new KeyValuePair("country",Country); @@ -866,29 +772,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Product != null) yield return Product; - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Product != null) yield return new ElementValue("product", Product); - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -904,7 +788,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -920,7 +804,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Product is not null) yield return new KeyValuePair("product",Product); @@ -1052,33 +936,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (EffectiveDate != null) yield return EffectiveDate; - foreach (var elem in Organization) { if (elem != null) yield return elem; } - if (ConfidentialityIndicator != null) yield return ConfidentialityIndicator; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (EffectiveDate != null) yield return new ElementValue("effectiveDate", EffectiveDate); - foreach (var elem in Organization) { if (elem != null) yield return new ElementValue("organization", elem); } - if (ConfidentialityIndicator != null) yield return new ElementValue("confidentialityIndicator", ConfidentialityIndicator); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1100,7 +958,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1122,7 +980,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1224,29 +1082,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1262,7 +1098,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1278,7 +1114,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1885,81 +1721,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Domain != null) yield return Domain; - if (VersionElement != null) yield return VersionElement; - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (CombinedPharmaceuticalDoseForm != null) yield return CombinedPharmaceuticalDoseForm; - foreach (var elem in Route) { if (elem != null) yield return elem; } - if (IndicationElement != null) yield return IndicationElement; - if (LegalStatusOfSupply != null) yield return LegalStatusOfSupply; - if (AdditionalMonitoringIndicator != null) yield return AdditionalMonitoringIndicator; - foreach (var elem in SpecialMeasures) { if (elem != null) yield return elem; } - if (PediatricUseIndicator != null) yield return PediatricUseIndicator; - foreach (var elem in Classification) { if (elem != null) yield return elem; } - foreach (var elem in MarketingStatus) { if (elem != null) yield return elem; } - foreach (var elem in PackagedMedicinalProduct) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - foreach (var elem in Impurity) { if (elem != null) yield return elem; } - foreach (var elem in AttachedDocument) { if (elem != null) yield return elem; } - foreach (var elem in MasterFile) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in ClinicalTrial) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in CrossReference) { if (elem != null) yield return elem; } - foreach (var elem in Operation) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Domain != null) yield return new ElementValue("domain", Domain); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (CombinedPharmaceuticalDoseForm != null) yield return new ElementValue("combinedPharmaceuticalDoseForm", CombinedPharmaceuticalDoseForm); - foreach (var elem in Route) { if (elem != null) yield return new ElementValue("route", elem); } - if (IndicationElement != null) yield return new ElementValue("indication", IndicationElement); - if (LegalStatusOfSupply != null) yield return new ElementValue("legalStatusOfSupply", LegalStatusOfSupply); - if (AdditionalMonitoringIndicator != null) yield return new ElementValue("additionalMonitoringIndicator", AdditionalMonitoringIndicator); - foreach (var elem in SpecialMeasures) { if (elem != null) yield return new ElementValue("specialMeasures", elem); } - if (PediatricUseIndicator != null) yield return new ElementValue("pediatricUseIndicator", PediatricUseIndicator); - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - foreach (var elem in MarketingStatus) { if (elem != null) yield return new ElementValue("marketingStatus", elem); } - foreach (var elem in PackagedMedicinalProduct) { if (elem != null) yield return new ElementValue("packagedMedicinalProduct", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - foreach (var elem in Impurity) { if (elem != null) yield return new ElementValue("impurity", elem); } - foreach (var elem in AttachedDocument) { if (elem != null) yield return new ElementValue("attachedDocument", elem); } - foreach (var elem in MasterFile) { if (elem != null) yield return new ElementValue("masterFile", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in ClinicalTrial) { if (elem != null) yield return new ElementValue("clinicalTrial", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in CrossReference) { if (elem != null) yield return new ElementValue("crossReference", elem); } - foreach (var elem in Operation) { if (elem != null) yield return new ElementValue("operation", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2053,7 +1815,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2147,7 +1909,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs index 054c710d98..ff54cf1453 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MessageDefinition.cs @@ -283,33 +283,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (ProfileElement != null) yield return ProfileElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -331,7 +305,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -353,7 +327,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -489,29 +463,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MessageElement != null) yield return MessageElement; - if (SituationElement != null) yield return SituationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (SituationElement != null) yield return new ElementValue("situation", SituationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -527,7 +479,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -543,7 +495,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MessageElement is not null) yield return new KeyValuePair("message",MessageElement); @@ -1305,73 +1257,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in ReplacesElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (BaseElement != null) yield return BaseElement; - foreach (var elem in ParentElement) { if (elem != null) yield return elem; } - if (Event != null) yield return Event; - if (CategoryElement != null) yield return CategoryElement; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (ResponseRequiredElement != null) yield return ResponseRequiredElement; - foreach (var elem in AllowedResponse) { if (elem != null) yield return elem; } - foreach (var elem in GraphElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in ReplacesElement) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - foreach (var elem in ParentElement) { if (elem != null) yield return new ElementValue("parent", elem); } - if (Event != null) yield return new ElementValue("event", Event); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (ResponseRequiredElement != null) yield return new ElementValue("responseRequired", ResponseRequiredElement); - foreach (var elem in AllowedResponse) { if (elem != null) yield return new ElementValue("allowedResponse", elem); } - foreach (var elem in GraphElement) { if (elem != null) yield return new ElementValue("graph", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1453,7 +1339,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1535,7 +1421,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs index 5642b8f392..5d212dedb8 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MessageHeader.cs @@ -248,33 +248,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Target != null) yield return Target; - if (EndpointElement != null) yield return EndpointElement; - if (Receiver != null) yield return Receiver; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Target != null) yield return new ElementValue("target", Target); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - if (Receiver != null) yield return new ElementValue("receiver", Receiver); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -296,7 +270,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -318,7 +292,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -537,35 +511,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (SoftwareElement != null) yield return SoftwareElement; - if (VersionElement != null) yield return VersionElement; - if (Contact != null) yield return Contact; - if (EndpointElement != null) yield return EndpointElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (SoftwareElement != null) yield return new ElementValue("software", SoftwareElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (Contact != null) yield return new ElementValue("contact", Contact); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -590,7 +536,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -615,7 +561,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -772,31 +718,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentifierElement != null) yield return IdentifierElement; - if (CodeElement != null) yield return CodeElement; - if (Details != null) yield return Details; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentifierElement != null) yield return new ElementValue("identifier", IdentifierElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Details != null) yield return new ElementValue("details", Details); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -815,7 +737,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -834,7 +756,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentifierElement is not null) yield return new KeyValuePair("identifier",IdentifierElement); @@ -1095,47 +1017,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Event != null) yield return Event; - foreach (var elem in Destination) { if (elem != null) yield return elem; } - if (Sender != null) yield return Sender; - if (Enterer != null) yield return Enterer; - if (Author != null) yield return Author; - if (Source != null) yield return Source; - if (Responsible != null) yield return Responsible; - if (Reason != null) yield return Reason; - if (Response != null) yield return Response; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (DefinitionElement != null) yield return DefinitionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Event != null) yield return new ElementValue("event", Event); - foreach (var elem in Destination) { if (elem != null) yield return new ElementValue("destination", elem); } - if (Sender != null) yield return new ElementValue("sender", Sender); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Author != null) yield return new ElementValue("author", Author); - if (Source != null) yield return new ElementValue("source", Source); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Response != null) yield return new ElementValue("response", Response); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1178,7 +1060,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1221,7 +1103,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Event is not null) yield return new KeyValuePair("event",Event); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs index 0836036c54..5fbca12cbc 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/MolecularSequence.cs @@ -514,43 +514,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Chromosome != null) yield return Chromosome; - if (GenomeBuildElement != null) yield return GenomeBuildElement; - if (OrientationElement != null) yield return OrientationElement; - if (ReferenceSeqId != null) yield return ReferenceSeqId; - if (ReferenceSeqPointer != null) yield return ReferenceSeqPointer; - if (ReferenceSeqStringElement != null) yield return ReferenceSeqStringElement; - if (StrandElement != null) yield return StrandElement; - if (WindowStartElement != null) yield return WindowStartElement; - if (WindowEndElement != null) yield return WindowEndElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Chromosome != null) yield return new ElementValue("chromosome", Chromosome); - if (GenomeBuildElement != null) yield return new ElementValue("genomeBuild", GenomeBuildElement); - if (OrientationElement != null) yield return new ElementValue("orientation", OrientationElement); - if (ReferenceSeqId != null) yield return new ElementValue("referenceSeqId", ReferenceSeqId); - if (ReferenceSeqPointer != null) yield return new ElementValue("referenceSeqPointer", ReferenceSeqPointer); - if (ReferenceSeqStringElement != null) yield return new ElementValue("referenceSeqString", ReferenceSeqStringElement); - if (StrandElement != null) yield return new ElementValue("strand", StrandElement); - if (WindowStartElement != null) yield return new ElementValue("windowStart", WindowStartElement); - if (WindowEndElement != null) yield return new ElementValue("windowEnd", WindowEndElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -587,7 +551,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -624,7 +588,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Chromosome is not null) yield return new KeyValuePair("chromosome",Chromosome); @@ -883,37 +847,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (ObservedAlleleElement != null) yield return ObservedAlleleElement; - if (ReferenceAlleleElement != null) yield return ReferenceAlleleElement; - if (CigarElement != null) yield return CigarElement; - if (VariantPointer != null) yield return VariantPointer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (ObservedAlleleElement != null) yield return new ElementValue("observedAllele", ObservedAlleleElement); - if (ReferenceAlleleElement != null) yield return new ElementValue("referenceAllele", ReferenceAlleleElement); - if (CigarElement != null) yield return new ElementValue("cigar", CigarElement); - if (VariantPointer != null) yield return new ElementValue("variantPointer", VariantPointer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -941,7 +875,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -969,7 +903,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StartElement is not null) yield return new KeyValuePair("start",StartElement); @@ -1480,55 +1414,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (StandardSequence != null) yield return StandardSequence; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (Score != null) yield return Score; - if (Method != null) yield return Method; - if (TruthTPElement != null) yield return TruthTPElement; - if (QueryTPElement != null) yield return QueryTPElement; - if (TruthFNElement != null) yield return TruthFNElement; - if (QueryFPElement != null) yield return QueryFPElement; - if (GtFPElement != null) yield return GtFPElement; - if (PrecisionElement != null) yield return PrecisionElement; - if (RecallElement != null) yield return RecallElement; - if (FScoreElement != null) yield return FScoreElement; - if (Roc != null) yield return Roc; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (StandardSequence != null) yield return new ElementValue("standardSequence", StandardSequence); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (Score != null) yield return new ElementValue("score", Score); - if (Method != null) yield return new ElementValue("method", Method); - if (TruthTPElement != null) yield return new ElementValue("truthTP", TruthTPElement); - if (QueryTPElement != null) yield return new ElementValue("queryTP", QueryTPElement); - if (TruthFNElement != null) yield return new ElementValue("truthFN", TruthFNElement); - if (QueryFPElement != null) yield return new ElementValue("queryFP", QueryFPElement); - if (GtFPElement != null) yield return new ElementValue("gtFP", GtFPElement); - if (PrecisionElement != null) yield return new ElementValue("precision", PrecisionElement); - if (RecallElement != null) yield return new ElementValue("recall", RecallElement); - if (FScoreElement != null) yield return new ElementValue("fScore", FScoreElement); - if (Roc != null) yield return new ElementValue("roc", Roc); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1583,7 +1469,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1638,7 +1524,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1960,39 +1846,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ScoreElement) { if (elem != null) yield return elem; } - foreach (var elem in NumTPElement) { if (elem != null) yield return elem; } - foreach (var elem in NumFPElement) { if (elem != null) yield return elem; } - foreach (var elem in NumFNElement) { if (elem != null) yield return elem; } - foreach (var elem in PrecisionElement) { if (elem != null) yield return elem; } - foreach (var elem in SensitivityElement) { if (elem != null) yield return elem; } - foreach (var elem in FMeasureElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ScoreElement) { if (elem != null) yield return new ElementValue("score", elem); } - foreach (var elem in NumTPElement) { if (elem != null) yield return new ElementValue("numTP", elem); } - foreach (var elem in NumFPElement) { if (elem != null) yield return new ElementValue("numFP", elem); } - foreach (var elem in NumFNElement) { if (elem != null) yield return new ElementValue("numFN", elem); } - foreach (var elem in PrecisionElement) { if (elem != null) yield return new ElementValue("precision", elem); } - foreach (var elem in SensitivityElement) { if (elem != null) yield return new ElementValue("sensitivity", elem); } - foreach (var elem in FMeasureElement) { if (elem != null) yield return new ElementValue("fMeasure", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2023,7 +1877,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2054,7 +1908,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ScoreElement?.Any() == true) yield return new KeyValuePair("score",ScoreElement); @@ -2330,37 +2184,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (UrlElement != null) yield return UrlElement; - if (NameElement != null) yield return NameElement; - if (DatasetIdElement != null) yield return DatasetIdElement; - if (VariantsetIdElement != null) yield return VariantsetIdElement; - if (ReadsetIdElement != null) yield return ReadsetIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DatasetIdElement != null) yield return new ElementValue("datasetId", DatasetIdElement); - if (VariantsetIdElement != null) yield return new ElementValue("variantsetId", VariantsetIdElement); - if (ReadsetIdElement != null) yield return new ElementValue("readsetId", ReadsetIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2388,7 +2212,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2416,7 +2240,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2601,35 +2425,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VariantType != null) yield return VariantType; - if (ExactElement != null) yield return ExactElement; - if (LengthElement != null) yield return LengthElement; - if (Outer != null) yield return Outer; - if (Inner != null) yield return Inner; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VariantType != null) yield return new ElementValue("variantType", VariantType); - if (ExactElement != null) yield return new ElementValue("exact", ExactElement); - if (LengthElement != null) yield return new ElementValue("length", LengthElement); - if (Outer != null) yield return new ElementValue("outer", Outer); - if (Inner != null) yield return new ElementValue("inner", Inner); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2654,7 +2450,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2679,7 +2475,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VariantType is not null) yield return new KeyValuePair("variantType",VariantType); @@ -2811,29 +2607,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2849,7 +2623,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2865,7 +2639,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StartElement is not null) yield return new KeyValuePair("start",StartElement); @@ -2994,29 +2768,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3032,7 +2784,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3048,7 +2800,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StartElement is not null) yield return new KeyValuePair("start",StartElement); @@ -3445,57 +3197,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (CoordinateSystemElement != null) yield return CoordinateSystemElement; - if (Patient != null) yield return Patient; - if (Specimen != null) yield return Specimen; - if (Device != null) yield return Device; - if (Performer != null) yield return Performer; - if (Quantity != null) yield return Quantity; - if (ReferenceSeq != null) yield return ReferenceSeq; - foreach (var elem in Variant) { if (elem != null) yield return elem; } - if (ObservedSeqElement != null) yield return ObservedSeqElement; - foreach (var elem in Quality) { if (elem != null) yield return elem; } - if (ReadCoverageElement != null) yield return ReadCoverageElement; - foreach (var elem in Repository) { if (elem != null) yield return elem; } - foreach (var elem in Pointer) { if (elem != null) yield return elem; } - foreach (var elem in StructureVariant) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (CoordinateSystemElement != null) yield return new ElementValue("coordinateSystem", CoordinateSystemElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Specimen != null) yield return new ElementValue("specimen", Specimen); - if (Device != null) yield return new ElementValue("device", Device); - if (Performer != null) yield return new ElementValue("performer", Performer); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (ReferenceSeq != null) yield return new ElementValue("referenceSeq", ReferenceSeq); - foreach (var elem in Variant) { if (elem != null) yield return new ElementValue("variant", elem); } - if (ObservedSeqElement != null) yield return new ElementValue("observedSeq", ObservedSeqElement); - foreach (var elem in Quality) { if (elem != null) yield return new ElementValue("quality", elem); } - if (ReadCoverageElement != null) yield return new ElementValue("readCoverage", ReadCoverageElement); - foreach (var elem in Repository) { if (elem != null) yield return new ElementValue("repository", elem); } - foreach (var elem in Pointer) { if (elem != null) yield return new ElementValue("pointer", elem); } - foreach (var elem in StructureVariant) { if (elem != null) yield return new ElementValue("structureVariant", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3553,7 +3255,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3611,7 +3313,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Money.cs b/src/Hl7.Fhir.R4B/Model/Generated/Money.cs index 4becf501b3..4b35b8c6c6 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Money.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Money.cs @@ -1267,29 +1267,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ValueElement != null) yield return ValueElement; - if (CurrencyElement != null) yield return CurrencyElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (CurrencyElement != null) yield return new ElementValue("currency", CurrencyElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1305,7 +1283,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1321,7 +1299,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ValueElement is not null) yield return new KeyValuePair("value",ValueElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs index 99266308ab..28e508785b 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/NamingSystem.cs @@ -333,35 +333,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ValueElement != null) yield return ValueElement; - if (PreferredElement != null) yield return PreferredElement; - if (CommentElement != null) yield return CommentElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -386,7 +358,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -411,7 +383,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -828,51 +800,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (KindElement != null) yield return KindElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (UsageElement != null) yield return UsageElement; - foreach (var elem in UniqueId) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - foreach (var elem in UniqueId) { if (elem != null) yield return new ElementValue("uniqueId", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -921,7 +849,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -970,7 +898,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs index f4c1d1d153..5c1e3ee0cf 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/NutritionOrder.cs @@ -236,37 +236,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Schedule) { if (elem != null) yield return elem; } - foreach (var elem in Nutrient) { if (elem != null) yield return elem; } - foreach (var elem in Texture) { if (elem != null) yield return elem; } - foreach (var elem in FluidConsistencyType) { if (elem != null) yield return elem; } - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Schedule) { if (elem != null) yield return new ElementValue("schedule", elem); } - foreach (var elem in Nutrient) { if (elem != null) yield return new ElementValue("nutrient", elem); } - foreach (var elem in Texture) { if (elem != null) yield return new ElementValue("texture", elem); } - foreach (var elem in FluidConsistencyType) { if (elem != null) yield return new ElementValue("fluidConsistencyType", elem); } - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -294,7 +264,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -322,7 +292,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -423,29 +393,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Modifier != null) yield return Modifier; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Modifier != null) yield return new ElementValue("modifier", Modifier); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -461,7 +409,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -477,7 +425,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Modifier is not null) yield return new KeyValuePair("modifier",Modifier); @@ -575,29 +523,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Modifier != null) yield return Modifier; - if (FoodType != null) yield return FoodType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Modifier != null) yield return new ElementValue("modifier", Modifier); - if (FoodType != null) yield return new ElementValue("foodType", FoodType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -613,7 +539,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -629,7 +555,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Modifier is not null) yield return new KeyValuePair("modifier",Modifier); @@ -811,35 +737,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ProductNameElement != null) yield return ProductNameElement; - foreach (var elem in Schedule) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ProductNameElement != null) yield return new ElementValue("productName", ProductNameElement); - foreach (var elem in Schedule) { if (elem != null) yield return new ElementValue("schedule", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -864,7 +762,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -889,7 +787,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1158,43 +1056,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (BaseFormulaType != null) yield return BaseFormulaType; - if (BaseFormulaProductNameElement != null) yield return BaseFormulaProductNameElement; - if (AdditiveType != null) yield return AdditiveType; - if (AdditiveProductNameElement != null) yield return AdditiveProductNameElement; - if (CaloricDensity != null) yield return CaloricDensity; - if (RouteofAdministration != null) yield return RouteofAdministration; - foreach (var elem in Administration) { if (elem != null) yield return elem; } - if (MaxVolumeToDeliver != null) yield return MaxVolumeToDeliver; - if (AdministrationInstructionElement != null) yield return AdministrationInstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (BaseFormulaType != null) yield return new ElementValue("baseFormulaType", BaseFormulaType); - if (BaseFormulaProductNameElement != null) yield return new ElementValue("baseFormulaProductName", BaseFormulaProductNameElement); - if (AdditiveType != null) yield return new ElementValue("additiveType", AdditiveType); - if (AdditiveProductNameElement != null) yield return new ElementValue("additiveProductName", AdditiveProductNameElement); - if (CaloricDensity != null) yield return new ElementValue("caloricDensity", CaloricDensity); - if (RouteofAdministration != null) yield return new ElementValue("routeofAdministration", RouteofAdministration); - foreach (var elem in Administration) { if (elem != null) yield return new ElementValue("administration", elem); } - if (MaxVolumeToDeliver != null) yield return new ElementValue("maxVolumeToDeliver", MaxVolumeToDeliver); - if (AdministrationInstructionElement != null) yield return new ElementValue("administrationInstruction", AdministrationInstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1231,7 +1093,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1268,7 +1130,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (BaseFormulaType is not null) yield return new KeyValuePair("baseFormulaType",BaseFormulaType); @@ -1390,31 +1252,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Schedule != null) yield return Schedule; - if (Quantity != null) yield return Quantity; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1433,7 +1271,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1452,7 +1290,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Schedule is not null) yield return new KeyValuePair("schedule",Schedule); @@ -1910,59 +1748,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (DateTimeElement != null) yield return DateTimeElement; - if (Orderer != null) yield return Orderer; - foreach (var elem in AllergyIntolerance) { if (elem != null) yield return elem; } - foreach (var elem in FoodPreferenceModifier) { if (elem != null) yield return elem; } - foreach (var elem in ExcludeFoodModifier) { if (elem != null) yield return elem; } - if (OralDiet != null) yield return OralDiet; - foreach (var elem in Supplement) { if (elem != null) yield return elem; } - if (EnteralFormula != null) yield return EnteralFormula; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return new ElementValue("instantiates", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateTimeElement != null) yield return new ElementValue("dateTime", DateTimeElement); - if (Orderer != null) yield return new ElementValue("orderer", Orderer); - foreach (var elem in AllergyIntolerance) { if (elem != null) yield return new ElementValue("allergyIntolerance", elem); } - foreach (var elem in FoodPreferenceModifier) { if (elem != null) yield return new ElementValue("foodPreferenceModifier", elem); } - foreach (var elem in ExcludeFoodModifier) { if (elem != null) yield return new ElementValue("excludeFoodModifier", elem); } - if (OralDiet != null) yield return new ElementValue("oralDiet", OralDiet); - foreach (var elem in Supplement) { if (elem != null) yield return new ElementValue("supplement", elem); } - if (EnteralFormula != null) yield return new ElementValue("enteralFormula", EnteralFormula); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2023,7 +1809,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2084,7 +1870,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs b/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs index 2595ce65d6..a3d2be46f2 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/NutritionProduct.cs @@ -176,29 +176,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - foreach (var elem in Amount) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - foreach (var elem in Amount) { if (elem != null) yield return new ElementValue("amount", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -214,7 +192,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -230,7 +208,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -325,29 +303,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - foreach (var elem in Amount) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - foreach (var elem in Amount) { if (elem != null) yield return new ElementValue("amount", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -363,7 +319,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -379,7 +335,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -477,29 +433,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -515,7 +449,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -531,7 +465,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -730,35 +664,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpiryElement != null) yield return ExpiryElement; - if (UseByElement != null) yield return UseByElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpiryElement != null) yield return new ElementValue("expiry", ExpiryElement); - if (UseByElement != null) yield return new ElementValue("useBy", UseByElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -783,7 +689,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -808,7 +714,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -1052,45 +958,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in Nutrient) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - foreach (var elem in KnownAllergen) { if (elem != null) yield return elem; } - foreach (var elem in ProductCharacteristic) { if (elem != null) yield return elem; } - if (Instance != null) yield return Instance; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in Nutrient) { if (elem != null) yield return new ElementValue("nutrient", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - foreach (var elem in KnownAllergen) { if (elem != null) yield return new ElementValue("knownAllergen", elem); } - foreach (var elem in ProductCharacteristic) { if (elem != null) yield return new ElementValue("productCharacteristic", elem); } - if (Instance != null) yield return new ElementValue("instance", Instance); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1130,7 +998,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1170,7 +1038,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs b/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs index 3f46e3cc19..0a99119e64 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Observation.cs @@ -233,37 +233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Low != null) yield return Low; - if (High != null) yield return High; - if (Type != null) yield return Type; - foreach (var elem in AppliesTo) { if (elem != null) yield return elem; } - if (Age != null) yield return Age; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Low != null) yield return new ElementValue("low", Low); - if (High != null) yield return new ElementValue("high", High); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in AppliesTo) { if (elem != null) yield return new ElementValue("appliesTo", elem); } - if (Age != null) yield return new ElementValue("age", Age); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -291,7 +261,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -319,7 +289,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Low is not null) yield return new KeyValuePair("low",Low); @@ -476,35 +446,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (DataAbsentReason != null) yield return DataAbsentReason; - foreach (var elem in Interpretation) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceRange) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - foreach (var elem in Interpretation) { if (elem != null) yield return new ElementValue("interpretation", elem); } - foreach (var elem in ReferenceRange) { if (elem != null) yield return new ElementValue("referenceRange", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -529,7 +471,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -554,7 +496,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1073,73 +1015,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Value != null) yield return Value; - if (DataAbsentReason != null) yield return DataAbsentReason; - foreach (var elem in Interpretation) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (Method != null) yield return Method; - if (Specimen != null) yield return Specimen; - if (Device != null) yield return Device; - foreach (var elem in ReferenceRange) { if (elem != null) yield return elem; } - foreach (var elem in HasMember) { if (elem != null) yield return elem; } - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Value != null) yield return new ElementValue("value", Value); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - foreach (var elem in Interpretation) { if (elem != null) yield return new ElementValue("interpretation", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Method != null) yield return new ElementValue("method", Method); - if (Specimen != null) yield return new ElementValue("specimen", Specimen); - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in ReferenceRange) { if (elem != null) yield return new ElementValue("referenceRange", elem); } - foreach (var elem in HasMember) { if (elem != null) yield return new ElementValue("hasMember", elem); } - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1221,7 +1097,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1303,7 +1179,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs index ac17f77572..b66162f810 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ObservationDefinition.cs @@ -321,33 +321,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CustomaryUnit != null) yield return CustomaryUnit; - if (Unit != null) yield return Unit; - if (ConversionFactorElement != null) yield return ConversionFactorElement; - if (DecimalPrecisionElement != null) yield return DecimalPrecisionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CustomaryUnit != null) yield return new ElementValue("customaryUnit", CustomaryUnit); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (ConversionFactorElement != null) yield return new ElementValue("conversionFactor", ConversionFactorElement); - if (DecimalPrecisionElement != null) yield return new ElementValue("decimalPrecision", DecimalPrecisionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +343,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -391,7 +365,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CustomaryUnit is not null) yield return new KeyValuePair("customaryUnit",CustomaryUnit); @@ -646,41 +620,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CategoryElement != null) yield return CategoryElement; - if (Range != null) yield return Range; - if (Context != null) yield return Context; - foreach (var elem in AppliesTo) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (Age != null) yield return Age; - if (GestationalAge != null) yield return GestationalAge; - if (ConditionElement != null) yield return ConditionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - if (Range != null) yield return new ElementValue("range", Range); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in AppliesTo) { if (elem != null) yield return new ElementValue("appliesTo", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (Age != null) yield return new ElementValue("age", Age); - if (GestationalAge != null) yield return new ElementValue("gestationalAge", GestationalAge); - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -714,7 +654,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -748,7 +688,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CategoryElement is not null) yield return new KeyValuePair("category",CategoryElement); @@ -1084,51 +1024,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in PermittedDataTypeElement) { if (elem != null) yield return elem; } - if (MultipleResultsAllowedElement != null) yield return MultipleResultsAllowedElement; - if (Method != null) yield return Method; - if (PreferredReportNameElement != null) yield return PreferredReportNameElement; - if (QuantitativeDetails != null) yield return QuantitativeDetails; - foreach (var elem in QualifiedInterval) { if (elem != null) yield return elem; } - if (ValidCodedValueSet != null) yield return ValidCodedValueSet; - if (NormalCodedValueSet != null) yield return NormalCodedValueSet; - if (AbnormalCodedValueSet != null) yield return AbnormalCodedValueSet; - if (CriticalCodedValueSet != null) yield return CriticalCodedValueSet; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in PermittedDataTypeElement) { if (elem != null) yield return new ElementValue("permittedDataType", elem); } - if (MultipleResultsAllowedElement != null) yield return new ElementValue("multipleResultsAllowed", MultipleResultsAllowedElement); - if (Method != null) yield return new ElementValue("method", Method); - if (PreferredReportNameElement != null) yield return new ElementValue("preferredReportName", PreferredReportNameElement); - if (QuantitativeDetails != null) yield return new ElementValue("quantitativeDetails", QuantitativeDetails); - foreach (var elem in QualifiedInterval) { if (elem != null) yield return new ElementValue("qualifiedInterval", elem); } - if (ValidCodedValueSet != null) yield return new ElementValue("validCodedValueSet", ValidCodedValueSet); - if (NormalCodedValueSet != null) yield return new ElementValue("normalCodedValueSet", NormalCodedValueSet); - if (AbnormalCodedValueSet != null) yield return new ElementValue("abnormalCodedValueSet", AbnormalCodedValueSet); - if (CriticalCodedValueSet != null) yield return new ElementValue("criticalCodedValueSet", CriticalCodedValueSet); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1177,7 +1073,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1226,7 +1122,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category?.Any() == true) yield return new KeyValuePair("category",Category); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs index 5e74d61afc..ebcbacc9ee 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/OperationDefinition.cs @@ -470,47 +470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (UseElement != null) yield return UseElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in TargetProfileElement) { if (elem != null) yield return elem; } - if (SearchTypeElement != null) yield return SearchTypeElement; - if (Binding != null) yield return Binding; - foreach (var elem in ReferencedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Part) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in TargetProfileElement) { if (elem != null) yield return new ElementValue("targetProfile", elem); } - if (SearchTypeElement != null) yield return new ElementValue("searchType", SearchTypeElement); - if (Binding != null) yield return new ElementValue("binding", Binding); - foreach (var elem in ReferencedFrom) { if (elem != null) yield return new ElementValue("referencedFrom", elem); } - foreach (var elem in Part) { if (elem != null) yield return new ElementValue("part", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -553,7 +513,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -596,7 +556,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -741,29 +701,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StrengthElement != null) yield return StrengthElement; - if (ValueSetElement != null) yield return ValueSetElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StrengthElement != null) yield return new ElementValue("strength", StrengthElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -779,7 +717,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -795,7 +733,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StrengthElement is not null) yield return new KeyValuePair("strength",StrengthElement); @@ -929,29 +867,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceElement != null) yield return SourceElement; - if (SourceIdElement != null) yield return SourceIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -967,7 +883,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -983,7 +899,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceElement is not null) yield return new KeyValuePair("source",SourceElement); @@ -1117,29 +1033,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ParameterNameElement) { if (elem != null) yield return elem; } - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ParameterNameElement) { if (elem != null) yield return new ElementValue("parameterName", elem); } - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1155,7 +1049,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1171,7 +1065,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ParameterNameElement?.Any() == true) yield return new KeyValuePair("parameterName",ParameterNameElement); @@ -2033,77 +1927,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (KindElement != null) yield return KindElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (AffectsStateElement != null) yield return AffectsStateElement; - if (CodeElement != null) yield return CodeElement; - if (CommentElement != null) yield return CommentElement; - if (BaseElement != null) yield return BaseElement; - foreach (var elem in ResourceElement) { if (elem != null) yield return elem; } - if (SystemElement != null) yield return SystemElement; - if (TypeElement != null) yield return TypeElement; - if (InstanceElement != null) yield return InstanceElement; - if (InputProfileElement != null) yield return InputProfileElement; - if (OutputProfileElement != null) yield return OutputProfileElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in Overload) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (AffectsStateElement != null) yield return new ElementValue("affectsState", AffectsStateElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - foreach (var elem in ResourceElement) { if (elem != null) yield return new ElementValue("resource", elem); } - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (InstanceElement != null) yield return new ElementValue("instance", InstanceElement); - if (InputProfileElement != null) yield return new ElementValue("inputProfile", InputProfileElement); - if (OutputProfileElement != null) yield return new ElementValue("outputProfile", OutputProfileElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in Overload) { if (elem != null) yield return new ElementValue("overload", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2191,7 +2015,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2279,7 +2103,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs b/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs index 0a704533b6..1b72061d04 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Organization.cs @@ -180,33 +180,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Purpose != null) yield return Purpose; - if (Name != null) yield return Name; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Purpose != null) yield return new ElementValue("purpose", Purpose); - if (Name != null) yield return new ElementValue("name", Name); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -228,7 +202,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -250,7 +224,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Purpose is not null) yield return new KeyValuePair("purpose",Purpose); @@ -528,45 +502,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (PartOf != null) yield return PartOf; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -606,7 +542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -646,7 +582,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs b/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs index 1b86f6ce02..cbc67f73ce 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/OrganizationAffiliation.cs @@ -329,49 +329,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Period != null) yield return Period; - if (Organization != null) yield return Organization; - if (ParticipatingOrganization != null) yield return ParticipatingOrganization; - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - foreach (var elem in HealthcareService) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (ParticipatingOrganization != null) yield return new ElementValue("participatingOrganization", ParticipatingOrganization); - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in HealthcareService) { if (elem != null) yield return new ElementValue("healthcareService", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -417,7 +375,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -463,7 +421,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs index f061d4ac38..b9b1b91afb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PackagedProductDefinition.cs @@ -142,29 +142,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Jurisdiction != null) yield return Jurisdiction; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Jurisdiction != null) yield return new ElementValue("jurisdiction", Jurisdiction); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -180,7 +158,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -196,7 +174,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -451,45 +429,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (QuantityElement != null) yield return QuantityElement; - foreach (var elem in Material) { if (elem != null) yield return elem; } - foreach (var elem in AlternateMaterial) { if (elem != null) yield return elem; } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return elem; } - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in ContainedItem) { if (elem != null) yield return elem; } - foreach (var elem in Package) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (QuantityElement != null) yield return new ElementValue("quantity", QuantityElement); - foreach (var elem in Material) { if (elem != null) yield return new ElementValue("material", elem); } - foreach (var elem in AlternateMaterial) { if (elem != null) yield return new ElementValue("alternateMaterial", elem); } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return new ElementValue("shelfLifeStorage", elem); } - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in ContainedItem) { if (elem != null) yield return new ElementValue("containedItem", elem); } - foreach (var elem in Package) { if (elem != null) yield return new ElementValue("package", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -529,7 +469,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -569,7 +509,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -689,31 +629,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Period != null) yield return Period; - foreach (var elem in SpecialPrecautionsForStorage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in SpecialPrecautionsForStorage) { if (elem != null) yield return new ElementValue("specialPrecautionsForStorage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -732,7 +648,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -751,7 +667,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -849,29 +765,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -887,7 +781,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -903,7 +797,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -997,29 +891,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1035,7 +907,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1051,7 +923,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -1411,53 +1283,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - foreach (var elem in PackageFor) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - foreach (var elem in ContainedItemQuantity) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in LegalStatusOfSupply) { if (elem != null) yield return elem; } - foreach (var elem in MarketingStatus) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - if (CopackagedIndicatorElement != null) yield return CopackagedIndicatorElement; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - if (Package != null) yield return Package; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in PackageFor) { if (elem != null) yield return new ElementValue("packageFor", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - foreach (var elem in ContainedItemQuantity) { if (elem != null) yield return new ElementValue("containedItemQuantity", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in LegalStatusOfSupply) { if (elem != null) yield return new ElementValue("legalStatusOfSupply", elem); } - foreach (var elem in MarketingStatus) { if (elem != null) yield return new ElementValue("marketingStatus", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - if (CopackagedIndicatorElement != null) yield return new ElementValue("copackagedIndicator", CopackagedIndicatorElement); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - if (Package != null) yield return new ElementValue("package", Package); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1509,7 +1335,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1561,7 +1387,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ParameterDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ParameterDefinition.cs index 80a7222278..2a4afef58c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ParameterDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ParameterDefinition.cs @@ -342,39 +342,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (UseElement != null) yield return UseElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (TypeElement != null) yield return TypeElement; - if (ProfileElement != null) yield return ProfileElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -405,7 +373,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -436,7 +404,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs b/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs index 6b7eddee86..5c5d2bc6de 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Patient.cs @@ -285,39 +285,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - if (Name != null) yield return Name; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - if (GenderElement != null) yield return GenderElement; - if (Organization != null) yield return Organization; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - if (Name != null) yield return new ElementValue("name", Name); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -348,7 +316,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -379,7 +347,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Relationship?.Any() == true) yield return new KeyValuePair("relationship",Relationship); @@ -500,29 +468,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (PreferredElement != null) yield return PreferredElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -538,7 +484,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -554,7 +500,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -675,29 +621,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Other != null) yield return Other; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Other != null) yield return new ElementValue("other", Other); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -713,7 +637,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -729,7 +653,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Other is not null) yield return new KeyValuePair("other",Other); @@ -1109,57 +1033,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (MaritalStatus != null) yield return MaritalStatus; - if (MultipleBirth != null) yield return MultipleBirth; - foreach (var elem in Photo) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - foreach (var elem in GeneralPractitioner) { if (elem != null) yield return elem; } - if (ManagingOrganization != null) yield return ManagingOrganization; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (MaritalStatus != null) yield return new ElementValue("maritalStatus", MaritalStatus); - if (MultipleBirth != null) yield return new ElementValue("multipleBirth", MultipleBirth); - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - foreach (var elem in GeneralPractitioner) { if (elem != null) yield return new ElementValue("generalPractitioner", elem); } - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1217,7 +1091,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1275,7 +1149,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs index 6fbd3ba0c6..9add68d4f4 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PaymentNotice.cs @@ -367,49 +367,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - if (CreatedElement != null) yield return CreatedElement; - if (Provider != null) yield return Provider; - if (Payment != null) yield return Payment; - if (PaymentDateElement != null) yield return PaymentDateElement; - if (Payee != null) yield return Payee; - if (Recipient != null) yield return Recipient; - if (Amount != null) yield return Amount; - if (PaymentStatus != null) yield return PaymentStatus; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Payment != null) yield return new ElementValue("payment", Payment); - if (PaymentDateElement != null) yield return new ElementValue("paymentDate", PaymentDateElement); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Recipient != null) yield return new ElementValue("recipient", Recipient); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (PaymentStatus != null) yield return new ElementValue("paymentStatus", PaymentStatus); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -455,7 +413,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -501,7 +459,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs index 83b76c8c21..a8bdbf5b7e 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PaymentReconciliation.cs @@ -304,45 +304,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Predecessor != null) yield return Predecessor; - if (Type != null) yield return Type; - if (Request != null) yield return Request; - if (Submitter != null) yield return Submitter; - if (Response != null) yield return Response; - if (DateElement != null) yield return DateElement; - if (Responsible != null) yield return Responsible; - if (Payee != null) yield return Payee; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Predecessor != null) yield return new ElementValue("predecessor", Predecessor); - if (Type != null) yield return new ElementValue("type", Type); - if (Request != null) yield return new ElementValue("request", Request); - if (Submitter != null) yield return new ElementValue("submitter", Submitter); - if (Response != null) yield return new ElementValue("response", Response); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -382,7 +344,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -422,7 +384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -564,29 +526,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -602,7 +542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -618,7 +558,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1016,55 +956,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - if (CreatedElement != null) yield return CreatedElement; - if (PaymentIssuer != null) yield return PaymentIssuer; - if (Request != null) yield return Request; - if (Requestor != null) yield return Requestor; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (PaymentDateElement != null) yield return PaymentDateElement; - if (PaymentAmount != null) yield return PaymentAmount; - if (PaymentIdentifier != null) yield return PaymentIdentifier; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - if (FormCode != null) yield return FormCode; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (PaymentIssuer != null) yield return new ElementValue("paymentIssuer", PaymentIssuer); - if (Request != null) yield return new ElementValue("request", Request); - if (Requestor != null) yield return new ElementValue("requestor", Requestor); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (PaymentDateElement != null) yield return new ElementValue("paymentDate", PaymentDateElement); - if (PaymentAmount != null) yield return new ElementValue("paymentAmount", PaymentAmount); - if (PaymentIdentifier != null) yield return new ElementValue("paymentIdentifier", PaymentIdentifier); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - if (FormCode != null) yield return new ElementValue("formCode", FormCode); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1119,7 +1011,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1174,7 +1066,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Person.cs b/src/Hl7.Fhir.R4B/Model/Generated/Person.cs index 4f179340c0..b00d162bbb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Person.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Person.cs @@ -201,29 +201,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Target != null) yield return Target; - if (AssuranceElement != null) yield return AssuranceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Target != null) yield return new ElementValue("target", Target); - if (AssuranceElement != null) yield return new ElementValue("assurance", AssuranceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -239,7 +217,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -255,7 +233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target is not null) yield return new KeyValuePair("target",Target); @@ -528,45 +506,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (Photo != null) yield return Photo; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (Photo != null) yield return new ElementValue("photo", Photo); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -606,7 +546,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -646,7 +586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs index 4f2a14f3f5..02199c15c4 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PlanDefinition.cs @@ -235,39 +235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Description != null) yield return Description; - if (Priority != null) yield return Priority; - if (Start != null) yield return Start; - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Description != null) yield return new ElementValue("description", Description); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Start != null) yield return new ElementValue("start", Start); - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -298,7 +266,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -329,7 +297,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -449,31 +417,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Measure != null) yield return Measure; - if (Detail != null) yield return Detail; - if (Due != null) yield return Due; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Measure != null) yield return new ElementValue("measure", Measure); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (Due != null) yield return new ElementValue("due", Due); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -492,7 +436,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -511,7 +455,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Measure is not null) yield return new KeyValuePair("measure",Measure); @@ -1260,79 +1204,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PrefixElement != null) yield return PrefixElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TextEquivalentElement != null) yield return TextEquivalentElement; - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in GoalIdElement) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in Trigger) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - foreach (var elem in RelatedAction) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (GroupingBehaviorElement != null) yield return GroupingBehaviorElement; - if (SelectionBehaviorElement != null) yield return SelectionBehaviorElement; - if (RequiredBehaviorElement != null) yield return RequiredBehaviorElement; - if (PrecheckBehaviorElement != null) yield return PrecheckBehaviorElement; - if (CardinalityBehaviorElement != null) yield return CardinalityBehaviorElement; - if (Definition != null) yield return Definition; - if (TransformElement != null) yield return TransformElement; - foreach (var elem in DynamicValue) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TextEquivalentElement != null) yield return new ElementValue("textEquivalent", TextEquivalentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in GoalIdElement) { if (elem != null) yield return new ElementValue("goalId", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Trigger) { if (elem != null) yield return new ElementValue("trigger", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - foreach (var elem in RelatedAction) { if (elem != null) yield return new ElementValue("relatedAction", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (GroupingBehaviorElement != null) yield return new ElementValue("groupingBehavior", GroupingBehaviorElement); - if (SelectionBehaviorElement != null) yield return new ElementValue("selectionBehavior", SelectionBehaviorElement); - if (RequiredBehaviorElement != null) yield return new ElementValue("requiredBehavior", RequiredBehaviorElement); - if (PrecheckBehaviorElement != null) yield return new ElementValue("precheckBehavior", PrecheckBehaviorElement); - if (CardinalityBehaviorElement != null) yield return new ElementValue("cardinalityBehavior", CardinalityBehaviorElement); - if (Definition != null) yield return new ElementValue("definition", Definition); - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in DynamicValue) { if (elem != null) yield return new ElementValue("dynamicValue", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1423,7 +1295,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1514,7 +1386,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PrefixElement is not null) yield return new KeyValuePair("prefix",PrefixElement); @@ -1657,29 +1529,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1695,7 +1545,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1711,7 +1561,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -1866,31 +1716,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActionIdElement != null) yield return ActionIdElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (Offset != null) yield return Offset; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActionIdElement != null) yield return new ElementValue("actionId", ActionIdElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (Offset != null) yield return new ElementValue("offset", Offset); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1909,7 +1735,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1928,7 +1754,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActionIdElement is not null) yield return new KeyValuePair("actionId",ActionIdElement); @@ -2047,29 +1873,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2085,7 +1889,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2101,7 +1905,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2216,29 +2020,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2254,7 +2036,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2270,7 +2052,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -3127,87 +2909,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (Type != null) yield return Type; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (Type != null) yield return new ElementValue("type", Type); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3310,7 +3012,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3413,7 +3115,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Population.cs b/src/Hl7.Fhir.R4B/Model/Generated/Population.cs index b5e81dfc5e..e1f21c4dcd 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Population.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Population.cs @@ -164,33 +164,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Age != null) yield return Age; - if (Gender != null) yield return Gender; - if (Race != null) yield return Race; - if (PhysiologicalCondition != null) yield return PhysiologicalCondition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Age != null) yield return new ElementValue("age", Age); - if (Gender != null) yield return new ElementValue("gender", Gender); - if (Race != null) yield return new ElementValue("race", Race); - if (PhysiologicalCondition != null) yield return new ElementValue("physiologicalCondition", PhysiologicalCondition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -212,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -234,7 +208,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Age is not null) yield return new KeyValuePair("age",Age); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs index 2be5bd6c64..32eba13eab 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Practitioner.cs @@ -183,33 +183,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Period != null) yield return Period; - if (Issuer != null) yield return Issuer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Period != null) yield return new ElementValue("period", Period); - if (Issuer != null) yield return new ElementValue("issuer", Issuer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -231,7 +205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -253,7 +227,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -529,45 +503,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Photo) { if (elem != null) yield return elem; } - foreach (var elem in Qualification) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - foreach (var elem in Qualification) { if (elem != null) yield return new ElementValue("qualification", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -607,7 +543,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -647,7 +583,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs index 17c2828363..5f89e453a0 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/PractitionerRole.cs @@ -254,33 +254,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return elem; } - if (AllDayElement != null) yield return AllDayElement; - if (AvailableStartTimeElement != null) yield return AvailableStartTimeElement; - if (AvailableEndTimeElement != null) yield return AvailableEndTimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return new ElementValue("daysOfWeek", elem); } - if (AllDayElement != null) yield return new ElementValue("allDay", AllDayElement); - if (AvailableStartTimeElement != null) yield return new ElementValue("availableStartTime", AvailableStartTimeElement); - if (AvailableEndTimeElement != null) yield return new ElementValue("availableEndTime", AvailableEndTimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -302,7 +276,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -324,7 +298,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DaysOfWeekElement?.Any() == true) yield return new KeyValuePair("daysOfWeek",DaysOfWeekElement); @@ -441,29 +415,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (During != null) yield return During; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (During != null) yield return new ElementValue("during", During); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -479,7 +431,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -495,7 +447,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -826,53 +778,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Period != null) yield return Period; - if (Practitioner != null) yield return Practitioner; - if (Organization != null) yield return Organization; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - foreach (var elem in HealthcareService) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in AvailableTime) { if (elem != null) yield return elem; } - foreach (var elem in NotAvailable) { if (elem != null) yield return elem; } - if (AvailabilityExceptionsElement != null) yield return AvailabilityExceptionsElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Practitioner != null) yield return new ElementValue("practitioner", Practitioner); - if (Organization != null) yield return new ElementValue("organization", Organization); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in HealthcareService) { if (elem != null) yield return new ElementValue("healthcareService", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in AvailableTime) { if (elem != null) yield return new ElementValue("availableTime", elem); } - foreach (var elem in NotAvailable) { if (elem != null) yield return new ElementValue("notAvailable", elem); } - if (AvailabilityExceptionsElement != null) yield return new ElementValue("availabilityExceptions", AvailabilityExceptionsElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -924,7 +830,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -976,7 +882,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs index 9e12c5afe4..e99001b69a 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Procedure.cs @@ -168,31 +168,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -211,7 +187,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -230,7 +206,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -331,29 +307,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Action != null) yield return Action; - if (Manipulated != null) yield return Manipulated; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Action != null) yield return new ElementValue("action", Action); - if (Manipulated != null) yield return new ElementValue("manipulated", Manipulated); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -385,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action is not null) yield return new KeyValuePair("action",Action); @@ -991,81 +945,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Performed != null) yield return Performed; - if (Recorder != null) yield return Recorder; - if (Asserter != null) yield return Asserter; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (Outcome != null) yield return Outcome; - foreach (var elem in Report) { if (elem != null) yield return elem; } - foreach (var elem in Complication) { if (elem != null) yield return elem; } - foreach (var elem in ComplicationDetail) { if (elem != null) yield return elem; } - foreach (var elem in FollowUp) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in FocalDevice) { if (elem != null) yield return elem; } - foreach (var elem in UsedReference) { if (elem != null) yield return elem; } - foreach (var elem in UsedCode) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Performed != null) yield return new ElementValue("performed", Performed); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - if (Asserter != null) yield return new ElementValue("asserter", Asserter); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - foreach (var elem in Report) { if (elem != null) yield return new ElementValue("report", elem); } - foreach (var elem in Complication) { if (elem != null) yield return new ElementValue("complication", elem); } - foreach (var elem in ComplicationDetail) { if (elem != null) yield return new ElementValue("complicationDetail", elem); } - foreach (var elem in FollowUp) { if (elem != null) yield return new ElementValue("followUp", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in FocalDevice) { if (elem != null) yield return new ElementValue("focalDevice", elem); } - foreach (var elem in UsedReference) { if (elem != null) yield return new ElementValue("usedReference", elem); } - foreach (var elem in UsedCode) { if (elem != null) yield return new ElementValue("usedCode", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1159,7 +1039,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1253,7 +1133,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ProdCharacteristic.cs b/src/Hl7.Fhir.R4B/Model/Generated/ProdCharacteristic.cs index 19e43ba531..75f7796f6c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ProdCharacteristic.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ProdCharacteristic.cs @@ -328,47 +328,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Height != null) yield return Height; - if (Width != null) yield return Width; - if (Depth != null) yield return Depth; - if (Weight != null) yield return Weight; - if (NominalVolume != null) yield return NominalVolume; - if (ExternalDiameter != null) yield return ExternalDiameter; - if (ShapeElement != null) yield return ShapeElement; - foreach (var elem in ColorElement) { if (elem != null) yield return elem; } - foreach (var elem in ImprintElement) { if (elem != null) yield return elem; } - foreach (var elem in Image) { if (elem != null) yield return elem; } - if (Scoring != null) yield return Scoring; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Height != null) yield return new ElementValue("height", Height); - if (Width != null) yield return new ElementValue("width", Width); - if (Depth != null) yield return new ElementValue("depth", Depth); - if (Weight != null) yield return new ElementValue("weight", Weight); - if (NominalVolume != null) yield return new ElementValue("nominalVolume", NominalVolume); - if (ExternalDiameter != null) yield return new ElementValue("externalDiameter", ExternalDiameter); - if (ShapeElement != null) yield return new ElementValue("shape", ShapeElement); - foreach (var elem in ColorElement) { if (elem != null) yield return new ElementValue("color", elem); } - foreach (var elem in ImprintElement) { if (elem != null) yield return new ElementValue("imprint", elem); } - foreach (var elem in Image) { if (elem != null) yield return new ElementValue("image", elem); } - if (Scoring != null) yield return new ElementValue("scoring", Scoring); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -411,7 +371,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -454,7 +414,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Height is not null) yield return new KeyValuePair("height",Height); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ProductShelfLife.cs b/src/Hl7.Fhir.R4B/Model/Generated/ProductShelfLife.cs index c3f135e5a4..95c1dc9364 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ProductShelfLife.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ProductShelfLife.cs @@ -162,33 +162,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Type != null) yield return Type; - if (Period != null) yield return Period; - foreach (var elem in SpecialPrecautionsForStorage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Type != null) yield return new ElementValue("type", Type); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in SpecialPrecautionsForStorage) { if (elem != null) yield return new ElementValue("specialPrecautionsForStorage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +184,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -232,7 +206,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs index 86657031f2..eb5e9da5cf 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Provenance.cs @@ -228,33 +228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Who != null) yield return Who; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Who != null) yield return new ElementValue("who", Who); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -276,7 +250,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -298,7 +272,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -434,31 +408,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RoleElement != null) yield return RoleElement; - if (What != null) yield return What; - foreach (var elem in Agent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RoleElement != null) yield return new ElementValue("role", RoleElement); - if (What != null) yield return new ElementValue("what", What); - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -477,7 +427,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -496,7 +446,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RoleElement is not null) yield return new KeyValuePair("role",RoleElement); @@ -756,45 +706,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Target) { if (elem != null) yield return elem; } - if (Occurred != null) yield return Occurred; - if (RecordedElement != null) yield return RecordedElement; - foreach (var elem in PolicyElement) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (Activity != null) yield return Activity; - foreach (var elem in Agent) { if (elem != null) yield return elem; } - foreach (var elem in Entity) { if (elem != null) yield return elem; } - foreach (var elem in Signature) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - if (Occurred != null) yield return new ElementValue("occurred", Occurred); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - foreach (var elem in PolicyElement) { if (elem != null) yield return new ElementValue("policy", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (Activity != null) yield return new ElementValue("activity", Activity); - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - foreach (var elem in Entity) { if (elem != null) yield return new ElementValue("entity", elem); } - foreach (var elem in Signature) { if (elem != null) yield return new ElementValue("signature", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -834,7 +746,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -874,7 +786,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target?.Any() == true) yield return new KeyValuePair("target",Target); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs index 3062cad6ac..632ec68954 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Questionnaire.cs @@ -767,57 +767,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (DefinitionElement != null) yield return DefinitionElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (PrefixElement != null) yield return PrefixElement; - if (TextElement != null) yield return TextElement; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in EnableWhen) { if (elem != null) yield return elem; } - if (EnableBehaviorElement != null) yield return EnableBehaviorElement; - if (RequiredElement != null) yield return RequiredElement; - if (RepeatsElement != null) yield return RepeatsElement; - if (ReadOnlyElement != null) yield return ReadOnlyElement; - if (MaxLengthElement != null) yield return MaxLengthElement; - if (AnswerValueSetElement != null) yield return AnswerValueSetElement; - foreach (var elem in AnswerOption) { if (elem != null) yield return elem; } - foreach (var elem in Initial) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in EnableWhen) { if (elem != null) yield return new ElementValue("enableWhen", elem); } - if (EnableBehaviorElement != null) yield return new ElementValue("enableBehavior", EnableBehaviorElement); - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (RepeatsElement != null) yield return new ElementValue("repeats", RepeatsElement); - if (ReadOnlyElement != null) yield return new ElementValue("readOnly", ReadOnlyElement); - if (MaxLengthElement != null) yield return new ElementValue("maxLength", MaxLengthElement); - if (AnswerValueSetElement != null) yield return new ElementValue("answerValueSet", AnswerValueSetElement); - foreach (var elem in AnswerOption) { if (elem != null) yield return new ElementValue("answerOption", elem); } - foreach (var elem in Initial) { if (elem != null) yield return new ElementValue("initial", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -875,7 +825,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -933,7 +883,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1105,31 +1055,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (QuestionElement != null) yield return QuestionElement; - if (OperatorElement != null) yield return OperatorElement; - if (Answer != null) yield return Answer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (QuestionElement != null) yield return new ElementValue("question", QuestionElement); - if (OperatorElement != null) yield return new ElementValue("operator", OperatorElement); - if (Answer != null) yield return new ElementValue("answer", Answer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1148,7 +1074,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1167,7 +1093,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (QuestionElement is not null) yield return new KeyValuePair("question",QuestionElement); @@ -1288,29 +1214,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - if (InitialSelectedElement != null) yield return InitialSelectedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - if (InitialSelectedElement != null) yield return new ElementValue("initialSelected", InitialSelectedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1326,7 +1230,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1342,7 +1246,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -1428,27 +1332,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1461,7 +1345,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1474,7 +1358,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2160,69 +2044,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in DerivedFromElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - foreach (var elem in SubjectTypeElement) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in DerivedFromElement) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - foreach (var elem in SubjectTypeElement) { if (elem != null) yield return new ElementValue("subjectType", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2298,7 +2120,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2374,7 +2196,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs index 1986f63017..08dd1b594f 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/QuestionnaireResponse.cs @@ -293,35 +293,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (DefinitionElement != null) yield return DefinitionElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in Answer) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -346,7 +318,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -371,7 +343,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -476,29 +448,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -514,7 +464,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -530,7 +480,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -828,47 +778,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (QuestionnaireElement != null) yield return QuestionnaireElement; - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (AuthoredElement != null) yield return AuthoredElement; - if (Author != null) yield return Author; - if (Source != null) yield return Source; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (QuestionnaireElement != null) yield return new ElementValue("questionnaire", QuestionnaireElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (AuthoredElement != null) yield return new ElementValue("authored", AuthoredElement); - if (Author != null) yield return new ElementValue("author", Author); - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -911,7 +821,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -954,7 +864,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Ratio.cs b/src/Hl7.Fhir.R4B/Model/Generated/Ratio.cs index fe745e91e4..061d2d8fdd 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Ratio.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Ratio.cs @@ -131,29 +131,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Numerator != null) yield return Numerator; - if (Denominator != null) yield return Denominator; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Numerator != null) yield return new ElementValue("numerator", Numerator); - if (Denominator != null) yield return new ElementValue("denominator", Denominator); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -169,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -185,7 +163,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Numerator is not null) yield return new KeyValuePair("numerator",Numerator); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RatioRange.cs b/src/Hl7.Fhir.R4B/Model/Generated/RatioRange.cs index e5ae38df1c..ef6bc754c6 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/RatioRange.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/RatioRange.cs @@ -147,31 +147,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LowNumerator != null) yield return LowNumerator; - if (HighNumerator != null) yield return HighNumerator; - if (Denominator != null) yield return Denominator; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LowNumerator != null) yield return new ElementValue("lowNumerator", LowNumerator); - if (HighNumerator != null) yield return new ElementValue("highNumerator", HighNumerator); - if (Denominator != null) yield return new ElementValue("denominator", Denominator); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -190,7 +166,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -209,7 +185,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LowNumerator is not null) yield return new KeyValuePair("lowNumerator",LowNumerator); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs b/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs index 14f6883962..d062dfa7ec 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/RegulatedAuthorization.cs @@ -199,35 +199,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Type != null) yield return Type; - if (Status != null) yield return Status; - if (Date != null) yield return Date; - foreach (var elem in Application) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Type != null) yield return new ElementValue("type", Type); - if (Status != null) yield return new ElementValue("status", Status); - if (Date != null) yield return new ElementValue("date", Date); - foreach (var elem in Application) { if (elem != null) yield return new ElementValue("application", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -252,7 +224,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -277,7 +249,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -605,53 +577,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Region) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - if (ValidityPeriod != null) yield return ValidityPeriod; - if (Indication != null) yield return Indication; - if (IntendedUse != null) yield return IntendedUse; - foreach (var elem in Basis) { if (elem != null) yield return elem; } - if (Holder != null) yield return Holder; - if (Regulator != null) yield return Regulator; - if (Case != null) yield return Case; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Region) { if (elem != null) yield return new ElementValue("region", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - if (Indication != null) yield return new ElementValue("indication", Indication); - if (IntendedUse != null) yield return new ElementValue("intendedUse", IntendedUse); - foreach (var elem in Basis) { if (elem != null) yield return new ElementValue("basis", elem); } - if (Holder != null) yield return new ElementValue("holder", Holder); - if (Regulator != null) yield return new ElementValue("regulator", Regulator); - if (Case != null) yield return new ElementValue("case", Case); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -703,7 +629,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -755,7 +681,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs index 349b390aa6..794197c9af 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/RelatedPerson.cs @@ -166,29 +166,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (PreferredElement != null) yield return PreferredElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -204,7 +182,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -220,7 +198,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -529,49 +507,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Patient != null) yield return Patient; - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Address) { if (elem != null) yield return elem; } - foreach (var elem in Photo) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in Communication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -617,7 +553,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -663,7 +599,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs index 854e9e1c18..6eacde11bd 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/RequestGroup.cs @@ -623,63 +623,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PrefixElement != null) yield return PrefixElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TextEquivalentElement != null) yield return TextEquivalentElement; - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in RelatedAction) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (GroupingBehaviorElement != null) yield return GroupingBehaviorElement; - if (SelectionBehaviorElement != null) yield return SelectionBehaviorElement; - if (RequiredBehaviorElement != null) yield return RequiredBehaviorElement; - if (PrecheckBehaviorElement != null) yield return PrecheckBehaviorElement; - if (CardinalityBehaviorElement != null) yield return CardinalityBehaviorElement; - if (Resource != null) yield return Resource; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TextEquivalentElement != null) yield return new ElementValue("textEquivalent", TextEquivalentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in RelatedAction) { if (elem != null) yield return new ElementValue("relatedAction", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (GroupingBehaviorElement != null) yield return new ElementValue("groupingBehavior", GroupingBehaviorElement); - if (SelectionBehaviorElement != null) yield return new ElementValue("selectionBehavior", SelectionBehaviorElement); - if (RequiredBehaviorElement != null) yield return new ElementValue("requiredBehavior", RequiredBehaviorElement); - if (PrecheckBehaviorElement != null) yield return new ElementValue("precheckBehavior", PrecheckBehaviorElement); - if (CardinalityBehaviorElement != null) yield return new ElementValue("cardinalityBehavior", CardinalityBehaviorElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -746,7 +690,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -813,7 +757,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PrefixElement is not null) yield return new KeyValuePair("prefix",PrefixElement); @@ -948,29 +892,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -986,7 +908,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1002,7 +924,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -1156,31 +1078,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActionIdElement != null) yield return ActionIdElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (Offset != null) yield return Offset; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActionIdElement != null) yield return new ElementValue("actionId", ActionIdElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (Offset != null) yield return new ElementValue("offset", Offset); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1199,7 +1097,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1218,7 +1116,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActionIdElement is not null) yield return new KeyValuePair("actionId",ActionIdElement); @@ -1694,61 +1592,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Author != null) yield return Author; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1812,7 +1656,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1876,7 +1720,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs index f05c9ac6fb..d26d5e458c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchDefinition.cs @@ -998,93 +998,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (ShortTitleElement != null) yield return ShortTitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in CommentElement) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (Population != null) yield return Population; - if (Exposure != null) yield return Exposure; - if (ExposureAlternative != null) yield return ExposureAlternative; - if (Outcome != null) yield return Outcome; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ShortTitleElement != null) yield return new ElementValue("shortTitle", ShortTitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in CommentElement) { if (elem != null) yield return new ElementValue("comment", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (Population != null) yield return new ElementValue("population", Population); - if (Exposure != null) yield return new ElementValue("exposure", Exposure); - if (ExposureAlternative != null) yield return new ElementValue("exposureAlternative", ExposureAlternative); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1196,7 +1110,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1308,7 +1222,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs index a9f2d40616..6f946d33ee 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchElementDefinition.cs @@ -467,49 +467,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Definition != null) yield return Definition; - foreach (var elem in UsageContext) { if (elem != null) yield return elem; } - if (ExcludeElement != null) yield return ExcludeElement; - if (UnitOfMeasure != null) yield return UnitOfMeasure; - if (StudyEffectiveDescriptionElement != null) yield return StudyEffectiveDescriptionElement; - if (StudyEffective != null) yield return StudyEffective; - if (StudyEffectiveTimeFromStart != null) yield return StudyEffectiveTimeFromStart; - if (StudyEffectiveGroupMeasureElement != null) yield return StudyEffectiveGroupMeasureElement; - if (ParticipantEffectiveDescriptionElement != null) yield return ParticipantEffectiveDescriptionElement; - if (ParticipantEffective != null) yield return ParticipantEffective; - if (ParticipantEffectiveTimeFromStart != null) yield return ParticipantEffectiveTimeFromStart; - if (ParticipantEffectiveGroupMeasureElement != null) yield return ParticipantEffectiveGroupMeasureElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Definition != null) yield return new ElementValue("definition", Definition); - foreach (var elem in UsageContext) { if (elem != null) yield return new ElementValue("usageContext", elem); } - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (UnitOfMeasure != null) yield return new ElementValue("unitOfMeasure", UnitOfMeasure); - if (StudyEffectiveDescriptionElement != null) yield return new ElementValue("studyEffectiveDescription", StudyEffectiveDescriptionElement); - if (StudyEffective != null) yield return new ElementValue("studyEffective", StudyEffective); - if (StudyEffectiveTimeFromStart != null) yield return new ElementValue("studyEffectiveTimeFromStart", StudyEffectiveTimeFromStart); - if (StudyEffectiveGroupMeasureElement != null) yield return new ElementValue("studyEffectiveGroupMeasure", StudyEffectiveGroupMeasureElement); - if (ParticipantEffectiveDescriptionElement != null) yield return new ElementValue("participantEffectiveDescription", ParticipantEffectiveDescriptionElement); - if (ParticipantEffective != null) yield return new ElementValue("participantEffective", ParticipantEffective); - if (ParticipantEffectiveTimeFromStart != null) yield return new ElementValue("participantEffectiveTimeFromStart", ParticipantEffectiveTimeFromStart); - if (ParticipantEffectiveGroupMeasureElement != null) yield return new ElementValue("participantEffectiveGroupMeasure", ParticipantEffectiveGroupMeasureElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -555,7 +513,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -601,7 +559,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Definition is not null) yield return new KeyValuePair("definition",Definition); @@ -1576,91 +1534,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (ShortTitleElement != null) yield return ShortTitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in CommentElement) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (VariableTypeElement != null) yield return VariableTypeElement; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ShortTitleElement != null) yield return new ElementValue("shortTitle", ShortTitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in CommentElement) { if (elem != null) yield return new ElementValue("comment", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (VariableTypeElement != null) yield return new ElementValue("variableType", VariableTypeElement); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1769,7 +1643,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1878,7 +1752,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs index 1679d456ab..0d53c4a419 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchStudy.cs @@ -276,31 +276,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -319,7 +295,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -338,7 +314,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -454,29 +430,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -492,7 +446,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -508,7 +462,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1034,73 +988,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - foreach (var elem in Protocol) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (PrimaryPurposeType != null) yield return PrimaryPurposeType; - if (Phase != null) yield return Phase; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Focus) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Keyword) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Enrollment) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Sponsor != null) yield return Sponsor; - if (PrincipalInvestigator != null) yield return PrincipalInvestigator; - foreach (var elem in Site) { if (elem != null) yield return elem; } - if (ReasonStopped != null) yield return ReasonStopped; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Arm) { if (elem != null) yield return elem; } - foreach (var elem in Objective) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in Protocol) { if (elem != null) yield return new ElementValue("protocol", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (PrimaryPurposeType != null) yield return new ElementValue("primaryPurposeType", PrimaryPurposeType); - if (Phase != null) yield return new ElementValue("phase", Phase); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Keyword) { if (elem != null) yield return new ElementValue("keyword", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Enrollment) { if (elem != null) yield return new ElementValue("enrollment", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Sponsor != null) yield return new ElementValue("sponsor", Sponsor); - if (PrincipalInvestigator != null) yield return new ElementValue("principalInvestigator", PrincipalInvestigator); - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - if (ReasonStopped != null) yield return new ElementValue("reasonStopped", ReasonStopped); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Arm) { if (elem != null) yield return new ElementValue("arm", elem); } - foreach (var elem in Objective) { if (elem != null) yield return new ElementValue("objective", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1182,7 +1070,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1264,7 +1152,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs index 16d10b5dc5..1cb61190d3 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ResearchSubject.cs @@ -383,41 +383,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - if (Study != null) yield return Study; - if (Individual != null) yield return Individual; - if (AssignedArmElement != null) yield return AssignedArmElement; - if (ActualArmElement != null) yield return ActualArmElement; - if (Consent != null) yield return Consent; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Study != null) yield return new ElementValue("study", Study); - if (Individual != null) yield return new ElementValue("individual", Individual); - if (AssignedArmElement != null) yield return new ElementValue("assignedArm", AssignedArmElement); - if (ActualArmElement != null) yield return new ElementValue("actualArm", ActualArmElement); - if (Consent != null) yield return new ElementValue("consent", Consent); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -451,7 +417,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -485,7 +451,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs index bd2b8f02cb..f38c171b98 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/RiskAssessment.cs @@ -253,37 +253,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Outcome != null) yield return Outcome; - if (Probability != null) yield return Probability; - if (QualitativeRisk != null) yield return QualitativeRisk; - if (RelativeRiskElement != null) yield return RelativeRiskElement; - if (When != null) yield return When; - if (RationaleElement != null) yield return RationaleElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (Probability != null) yield return new ElementValue("probability", Probability); - if (QualitativeRisk != null) yield return new ElementValue("qualitativeRisk", QualitativeRisk); - if (RelativeRiskElement != null) yield return new ElementValue("relativeRisk", RelativeRiskElement); - if (When != null) yield return new ElementValue("when", When); - if (RationaleElement != null) yield return new ElementValue("rationale", RationaleElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -311,7 +281,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -339,7 +309,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Outcome is not null) yield return new KeyValuePair("outcome",Outcome); @@ -730,59 +700,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (BasedOn != null) yield return BasedOn; - if (Parent != null) yield return Parent; - if (StatusElement != null) yield return StatusElement; - if (Method != null) yield return Method; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (Condition != null) yield return Condition; - if (Performer != null) yield return Performer; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Basis) { if (elem != null) yield return elem; } - foreach (var elem in Prediction) { if (elem != null) yield return elem; } - if (MitigationElement != null) yield return MitigationElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (BasedOn != null) yield return new ElementValue("basedOn", BasedOn); - if (Parent != null) yield return new ElementValue("parent", Parent); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Method != null) yield return new ElementValue("method", Method); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Basis) { if (elem != null) yield return new ElementValue("basis", elem); } - foreach (var elem in Prediction) { if (elem != null) yield return new ElementValue("prediction", elem); } - if (MitigationElement != null) yield return new ElementValue("mitigation", MitigationElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -843,7 +761,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -904,7 +822,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SampledData.cs b/src/Hl7.Fhir.R4B/Model/Generated/SampledData.cs index d21ca98595..a17dd0b5cc 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SampledData.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SampledData.cs @@ -322,39 +322,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Origin != null) yield return Origin; - if (PeriodElement != null) yield return PeriodElement; - if (FactorElement != null) yield return FactorElement; - if (LowerLimitElement != null) yield return LowerLimitElement; - if (UpperLimitElement != null) yield return UpperLimitElement; - if (DimensionsElement != null) yield return DimensionsElement; - if (DataElement != null) yield return DataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Origin != null) yield return new ElementValue("origin", Origin); - if (PeriodElement != null) yield return new ElementValue("period", PeriodElement); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (LowerLimitElement != null) yield return new ElementValue("lowerLimit", LowerLimitElement); - if (UpperLimitElement != null) yield return new ElementValue("upperLimit", UpperLimitElement); - if (DimensionsElement != null) yield return new ElementValue("dimensions", DimensionsElement); - if (DataElement != null) yield return new ElementValue("data", DataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -385,7 +353,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -416,7 +384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Origin is not null) yield return new KeyValuePair("origin",Origin); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs b/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs index 20d03c7ab1..b26652f441 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Schedule.cs @@ -271,41 +271,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in ServiceCategory) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Actor) { if (elem != null) yield return elem; } - if (PlanningHorizon != null) yield return PlanningHorizon; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in ServiceCategory) { if (elem != null) yield return new ElementValue("serviceCategory", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - if (PlanningHorizon != null) yield return new ElementValue("planningHorizon", PlanningHorizon); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -339,7 +305,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -373,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs index de803db64b..4c48048407 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SearchParameter.cs @@ -371,29 +371,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DefinitionElement != null) yield return DefinitionElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -409,7 +387,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -425,7 +403,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DefinitionElement is not null) yield return new KeyValuePair("definition",DefinitionElement); @@ -1315,77 +1293,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (DerivedFromElement != null) yield return DerivedFromElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in BaseElement) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (XpathElement != null) yield return XpathElement; - if (XpathUsageElement != null) yield return XpathUsageElement; - foreach (var elem in TargetElement) { if (elem != null) yield return elem; } - if (MultipleOrElement != null) yield return MultipleOrElement; - if (MultipleAndElement != null) yield return MultipleAndElement; - foreach (var elem in ComparatorElement) { if (elem != null) yield return elem; } - foreach (var elem in ModifierElement) { if (elem != null) yield return elem; } - foreach (var elem in ChainElement) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DerivedFromElement != null) yield return new ElementValue("derivedFrom", DerivedFromElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in BaseElement) { if (elem != null) yield return new ElementValue("base", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (XpathElement != null) yield return new ElementValue("xpath", XpathElement); - if (XpathUsageElement != null) yield return new ElementValue("xpathUsage", XpathUsageElement); - foreach (var elem in TargetElement) { if (elem != null) yield return new ElementValue("target", elem); } - if (MultipleOrElement != null) yield return new ElementValue("multipleOr", MultipleOrElement); - if (MultipleAndElement != null) yield return new ElementValue("multipleAnd", MultipleAndElement); - foreach (var elem in ComparatorElement) { if (elem != null) yield return new ElementValue("comparator", elem); } - foreach (var elem in ModifierElement) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ChainElement) { if (elem != null) yield return new ElementValue("chain", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1473,7 +1381,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1561,7 +1469,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs index a7e1d4f61d..163599f045 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/ServiceRequest.cs @@ -837,91 +837,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (Requisition != null) yield return Requisition; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Code != null) yield return Code; - foreach (var elem in OrderDetail) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (AsNeeded != null) yield return AsNeeded; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (PerformerType != null) yield return PerformerType; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in LocationCode) { if (elem != null) yield return elem; } - foreach (var elem in LocationReference) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (PatientInstructionElement != null) yield return PatientInstructionElement; - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (Requisition != null) yield return new ElementValue("requisition", Requisition); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in OrderDetail) { if (elem != null) yield return new ElementValue("orderDetail", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AsNeeded != null) yield return new ElementValue("asNeeded", AsNeeded); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in LocationCode) { if (elem != null) yield return new ElementValue("locationCode", elem); } - foreach (var elem in LocationReference) { if (elem != null) yield return new ElementValue("locationReference", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (PatientInstructionElement != null) yield return new ElementValue("patientInstruction", PatientInstructionElement); - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1030,7 +946,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1139,7 +1055,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs b/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs index c271d1fb42..cc33c644ef 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Slot.cs @@ -419,47 +419,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in ServiceCategory) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - if (AppointmentType != null) yield return AppointmentType; - if (Schedule != null) yield return Schedule; - if (StatusElement != null) yield return StatusElement; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (OverbookedElement != null) yield return OverbookedElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in ServiceCategory) { if (elem != null) yield return new ElementValue("serviceCategory", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - if (AppointmentType != null) yield return new ElementValue("appointmentType", AppointmentType); - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (OverbookedElement != null) yield return new ElementValue("overbooked", OverbookedElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -502,7 +462,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -545,7 +505,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs index dcd433cc4a..37c0e37a07 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Specimen.cs @@ -269,39 +269,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Collector != null) yield return Collector; - if (Collected != null) yield return Collected; - if (Duration != null) yield return Duration; - if (Quantity != null) yield return Quantity; - if (Method != null) yield return Method; - if (BodySite != null) yield return BodySite; - if (FastingStatus != null) yield return FastingStatus; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Collector != null) yield return new ElementValue("collector", Collector); - if (Collected != null) yield return new ElementValue("collected", Collected); - if (Duration != null) yield return new ElementValue("duration", Duration); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Method != null) yield return new ElementValue("method", Method); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (FastingStatus != null) yield return new ElementValue("fastingStatus", FastingStatus); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -332,7 +300,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -363,7 +331,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Collector is not null) yield return new KeyValuePair("collector",Collector); @@ -520,33 +488,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Procedure != null) yield return Procedure; - foreach (var elem in Additive) { if (elem != null) yield return elem; } - if (Time != null) yield return Time; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - foreach (var elem in Additive) { if (elem != null) yield return new ElementValue("additive", elem); } - if (Time != null) yield return new ElementValue("time", Time); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -568,7 +510,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -590,7 +532,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -776,37 +718,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (Type != null) yield return Type; - if (Capacity != null) yield return Capacity; - if (SpecimenQuantity != null) yield return SpecimenQuantity; - if (Additive != null) yield return Additive; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Capacity != null) yield return new ElementValue("capacity", Capacity); - if (SpecimenQuantity != null) yield return new ElementValue("specimenQuantity", SpecimenQuantity); - if (Additive != null) yield return new ElementValue("additive", Additive); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -834,7 +746,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -862,7 +774,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1177,51 +1089,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (AccessionIdentifier != null) yield return AccessionIdentifier; - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (ReceivedTimeElement != null) yield return ReceivedTimeElement; - foreach (var elem in Parent) { if (elem != null) yield return elem; } - foreach (var elem in Request) { if (elem != null) yield return elem; } - if (Collection != null) yield return Collection; - foreach (var elem in Processing) { if (elem != null) yield return elem; } - foreach (var elem in Container) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (AccessionIdentifier != null) yield return new ElementValue("accessionIdentifier", AccessionIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (ReceivedTimeElement != null) yield return new ElementValue("receivedTime", ReceivedTimeElement); - foreach (var elem in Parent) { if (elem != null) yield return new ElementValue("parent", elem); } - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - if (Collection != null) yield return new ElementValue("collection", Collection); - foreach (var elem in Processing) { if (elem != null) yield return new ElementValue("processing", elem); } - foreach (var elem in Container) { if (elem != null) yield return new ElementValue("container", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1270,7 +1138,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1319,7 +1187,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs index 3d3d03604c..b9994cb71e 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SpecimenDefinition.cs @@ -325,41 +325,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IsDerivedElement != null) yield return IsDerivedElement; - if (Type != null) yield return Type; - if (PreferenceElement != null) yield return PreferenceElement; - if (Container != null) yield return Container; - if (RequirementElement != null) yield return RequirementElement; - if (RetentionTime != null) yield return RetentionTime; - foreach (var elem in RejectionCriterion) { if (elem != null) yield return elem; } - foreach (var elem in Handling) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IsDerivedElement != null) yield return new ElementValue("isDerived", IsDerivedElement); - if (Type != null) yield return new ElementValue("type", Type); - if (PreferenceElement != null) yield return new ElementValue("preference", PreferenceElement); - if (Container != null) yield return new ElementValue("container", Container); - if (RequirementElement != null) yield return new ElementValue("requirement", RequirementElement); - if (RetentionTime != null) yield return new ElementValue("retentionTime", RetentionTime); - foreach (var elem in RejectionCriterion) { if (elem != null) yield return new ElementValue("rejectionCriterion", elem); } - foreach (var elem in Handling) { if (elem != null) yield return new ElementValue("handling", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -393,7 +359,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -427,7 +393,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IsDerivedElement is not null) yield return new KeyValuePair("isDerived",IsDerivedElement); @@ -664,41 +630,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Material != null) yield return Material; - if (Type != null) yield return Type; - if (Cap != null) yield return Cap; - if (DescriptionElement != null) yield return DescriptionElement; - if (Capacity != null) yield return Capacity; - if (MinimumVolume != null) yield return MinimumVolume; - foreach (var elem in Additive) { if (elem != null) yield return elem; } - if (PreparationElement != null) yield return PreparationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Material != null) yield return new ElementValue("material", Material); - if (Type != null) yield return new ElementValue("type", Type); - if (Cap != null) yield return new ElementValue("cap", Cap); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Capacity != null) yield return new ElementValue("capacity", Capacity); - if (MinimumVolume != null) yield return new ElementValue("minimumVolume", MinimumVolume); - foreach (var elem in Additive) { if (elem != null) yield return new ElementValue("additive", elem); } - if (PreparationElement != null) yield return new ElementValue("preparation", PreparationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -732,7 +664,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -766,7 +698,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Material is not null) yield return new KeyValuePair("material",Material); @@ -857,27 +789,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Additive != null) yield return Additive; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Additive != null) yield return new ElementValue("additive", Additive); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -890,7 +802,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -903,7 +815,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Additive is not null) yield return new KeyValuePair("additive",Additive); @@ -1049,33 +961,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TemperatureQualifier != null) yield return TemperatureQualifier; - if (TemperatureRange != null) yield return TemperatureRange; - if (MaxDuration != null) yield return MaxDuration; - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TemperatureQualifier != null) yield return new ElementValue("temperatureQualifier", TemperatureQualifier); - if (TemperatureRange != null) yield return new ElementValue("temperatureRange", TemperatureRange); - if (MaxDuration != null) yield return new ElementValue("maxDuration", MaxDuration); - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1097,7 +983,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1119,7 +1005,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TemperatureQualifier is not null) yield return new KeyValuePair("temperatureQualifier",TemperatureQualifier); @@ -1291,37 +1177,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (TypeCollected != null) yield return TypeCollected; - foreach (var elem in PatientPreparation) { if (elem != null) yield return elem; } - if (TimeAspectElement != null) yield return TimeAspectElement; - foreach (var elem in Collection) { if (elem != null) yield return elem; } - foreach (var elem in TypeTested) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (TypeCollected != null) yield return new ElementValue("typeCollected", TypeCollected); - foreach (var elem in PatientPreparation) { if (elem != null) yield return new ElementValue("patientPreparation", elem); } - if (TimeAspectElement != null) yield return new ElementValue("timeAspect", TimeAspectElement); - foreach (var elem in Collection) { if (elem != null) yield return new ElementValue("collection", elem); } - foreach (var elem in TypeTested) { if (elem != null) yield return new ElementValue("typeTested", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1349,7 +1205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1377,7 +1233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs index 0ce4d29051..90381ef030 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/StructureMap.cs @@ -544,33 +544,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (ModeElement != null) yield return ModeElement; - if (AliasElement != null) yield return AliasElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (AliasElement != null) yield return new ElementValue("alias", AliasElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -592,7 +566,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -614,7 +588,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); @@ -854,37 +828,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ExtendsElement != null) yield return ExtendsElement; - if (TypeModeElement != null) yield return TypeModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ExtendsElement != null) yield return new ElementValue("extends", ExtendsElement); - if (TypeModeElement != null) yield return new ElementValue("typeMode", TypeModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -912,7 +856,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -940,7 +884,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1149,33 +1093,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TypeElement != null) yield return TypeElement; - if (ModeElement != null) yield return ModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1197,7 +1115,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1219,7 +1137,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1419,37 +1337,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in Source) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - foreach (var elem in Dependent) { if (elem != null) yield return elem; } - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - foreach (var elem in Dependent) { if (elem != null) yield return new ElementValue("dependent", elem); } - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1477,7 +1365,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1505,7 +1393,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1931,47 +1819,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContextElement != null) yield return ContextElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (TypeElement != null) yield return TypeElement; - if (DefaultValue != null) yield return DefaultValue; - if (ElementElement != null) yield return ElementElement; - if (ListModeElement != null) yield return ListModeElement; - if (VariableElement != null) yield return VariableElement; - if (ConditionElement != null) yield return ConditionElement; - if (CheckElement != null) yield return CheckElement; - if (LogMessageElement != null) yield return LogMessageElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContextElement != null) yield return new ElementValue("context", ContextElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DefaultValue != null) yield return new ElementValue("defaultValue", DefaultValue); - if (ElementElement != null) yield return new ElementValue("element", ElementElement); - if (ListModeElement != null) yield return new ElementValue("listMode", ListModeElement); - if (VariableElement != null) yield return new ElementValue("variable", VariableElement); - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - if (CheckElement != null) yield return new ElementValue("check", CheckElement); - if (LogMessageElement != null) yield return new ElementValue("logMessage", LogMessageElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2014,7 +1862,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2057,7 +1905,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContextElement is not null) yield return new KeyValuePair("context",ContextElement); @@ -2389,41 +2237,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContextElement != null) yield return ContextElement; - if (ContextTypeElement != null) yield return ContextTypeElement; - if (ElementElement != null) yield return ElementElement; - if (VariableElement != null) yield return VariableElement; - foreach (var elem in ListModeElement) { if (elem != null) yield return elem; } - if (ListRuleIdElement != null) yield return ListRuleIdElement; - if (TransformElement != null) yield return TransformElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContextElement != null) yield return new ElementValue("context", ContextElement); - if (ContextTypeElement != null) yield return new ElementValue("contextType", ContextTypeElement); - if (ElementElement != null) yield return new ElementValue("element", ElementElement); - if (VariableElement != null) yield return new ElementValue("variable", VariableElement); - foreach (var elem in ListModeElement) { if (elem != null) yield return new ElementValue("listMode", elem); } - if (ListRuleIdElement != null) yield return new ElementValue("listRuleId", ListRuleIdElement); - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2457,7 +2271,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2491,7 +2305,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContextElement is not null) yield return new KeyValuePair("context",ContextElement); @@ -2577,27 +2391,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2610,7 +2404,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2623,7 +2417,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2753,29 +2547,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in VariableElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in VariableElement) { if (elem != null) yield return new ElementValue("variable", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2791,7 +2563,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2807,7 +2579,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -3374,61 +3146,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in Structure) { if (elem != null) yield return elem; } - foreach (var elem in ImportElement) { if (elem != null) yield return elem; } - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in Structure) { if (elem != null) yield return new ElementValue("structure", elem); } - foreach (var elem in ImportElement) { if (elem != null) yield return new ElementValue("import", elem); } - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3492,7 +3210,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3556,7 +3274,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs index b5aa388622..0ed401c8c9 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Subscription.cs @@ -295,33 +295,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (EndpointElement != null) yield return EndpointElement; - if (PayloadElement != null) yield return PayloadElement; - foreach (var elem in HeaderElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - if (PayloadElement != null) yield return new ElementValue("payload", PayloadElement); - foreach (var elem in HeaderElement) { if (elem != null) yield return new ElementValue("header", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -343,7 +317,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -365,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -624,39 +598,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (EndElement != null) yield return EndElement; - if (ReasonElement != null) yield return ReasonElement; - if (CriteriaElement != null) yield return CriteriaElement; - if (ErrorElement != null) yield return ErrorElement; - if (Channel != null) yield return Channel; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (ReasonElement != null) yield return new ElementValue("reason", ReasonElement); - if (CriteriaElement != null) yield return new ElementValue("criteria", CriteriaElement); - if (ErrorElement != null) yield return new ElementValue("error", ErrorElement); - if (Channel != null) yield return new ElementValue("channel", Channel); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -687,7 +629,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -718,7 +660,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs index 1d09c73b61..b6fb550d86 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionStatus.cs @@ -260,33 +260,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (EventNumberElement != null) yield return EventNumberElement; - if (TimestampElement != null) yield return TimestampElement; - if (Focus != null) yield return Focus; - foreach (var elem in AdditionalContext) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (EventNumberElement != null) yield return new ElementValue("eventNumber", EventNumberElement); - if (TimestampElement != null) yield return new ElementValue("timestamp", TimestampElement); - if (Focus != null) yield return new ElementValue("focus", Focus); - foreach (var elem in AdditionalContext) { if (elem != null) yield return new ElementValue("additionalContext", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -308,7 +282,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -330,7 +304,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (EventNumberElement is not null) yield return new KeyValuePair("eventNumber",EventNumberElement); @@ -575,39 +549,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (TypeElement != null) yield return TypeElement; - if (EventsSinceSubscriptionStartElement != null) yield return EventsSinceSubscriptionStartElement; - foreach (var elem in NotificationEvent) { if (elem != null) yield return elem; } - if (Subscription != null) yield return Subscription; - if (TopicElement != null) yield return TopicElement; - foreach (var elem in Error) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (EventsSinceSubscriptionStartElement != null) yield return new ElementValue("eventsSinceSubscriptionStart", EventsSinceSubscriptionStartElement); - foreach (var elem in NotificationEvent) { if (elem != null) yield return new ElementValue("notificationEvent", elem); } - if (Subscription != null) yield return new ElementValue("subscription", Subscription); - if (TopicElement != null) yield return new ElementValue("topic", TopicElement); - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -638,7 +580,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -669,7 +611,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs index 850db7d20f..cd5c9893cb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SubscriptionTopic.cs @@ -421,35 +421,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (ResourceElement != null) yield return ResourceElement; - foreach (var elem in SupportedInteractionElement) { if (elem != null) yield return elem; } - if (QueryCriteria != null) yield return QueryCriteria; - if (FhirPathCriteriaElement != null) yield return FhirPathCriteriaElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - foreach (var elem in SupportedInteractionElement) { if (elem != null) yield return new ElementValue("supportedInteraction", elem); } - if (QueryCriteria != null) yield return new ElementValue("queryCriteria", QueryCriteria); - if (FhirPathCriteriaElement != null) yield return new ElementValue("fhirPathCriteria", FhirPathCriteriaElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -474,7 +446,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -499,7 +471,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -740,35 +712,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PreviousElement != null) yield return PreviousElement; - if (ResultForCreateElement != null) yield return ResultForCreateElement; - if (CurrentElement != null) yield return CurrentElement; - if (ResultForDeleteElement != null) yield return ResultForDeleteElement; - if (RequireBothElement != null) yield return RequireBothElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PreviousElement != null) yield return new ElementValue("previous", PreviousElement); - if (ResultForCreateElement != null) yield return new ElementValue("resultForCreate", ResultForCreateElement); - if (CurrentElement != null) yield return new ElementValue("current", CurrentElement); - if (ResultForDeleteElement != null) yield return new ElementValue("resultForDelete", ResultForDeleteElement); - if (RequireBothElement != null) yield return new ElementValue("requireBoth", RequireBothElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -793,7 +737,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -818,7 +762,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PreviousElement is not null) yield return new KeyValuePair("previous",PreviousElement); @@ -973,31 +917,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Event != null) yield return Event; - if (ResourceElement != null) yield return ResourceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Event != null) yield return new ElementValue("event", Event); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1016,7 +936,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1035,7 +955,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1275,35 +1195,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (ResourceElement != null) yield return ResourceElement; - if (FilterParameterElement != null) yield return FilterParameterElement; - if (FilterDefinitionElement != null) yield return FilterDefinitionElement; - foreach (var elem in ModifierElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (FilterParameterElement != null) yield return new ElementValue("filterParameter", FilterParameterElement); - if (FilterDefinitionElement != null) yield return new ElementValue("filterDefinition", FilterDefinitionElement); - foreach (var elem in ModifierElement) { if (elem != null) yield return new ElementValue("modifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1328,7 +1220,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1353,7 +1245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1526,31 +1418,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResourceElement != null) yield return ResourceElement; - foreach (var elem in IncludeElement) { if (elem != null) yield return elem; } - foreach (var elem in RevIncludeElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - foreach (var elem in IncludeElement) { if (elem != null) yield return new ElementValue("include", elem); } - foreach (var elem in RevIncludeElement) { if (elem != null) yield return new ElementValue("revInclude", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1569,7 +1437,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1588,7 +1456,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResourceElement is not null) yield return new KeyValuePair("resource",ResourceElement); @@ -2239,69 +2107,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in DerivedFromElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in ResourceTrigger) { if (elem != null) yield return elem; } - foreach (var elem in EventTrigger) { if (elem != null) yield return elem; } - foreach (var elem in CanFilterBy) { if (elem != null) yield return elem; } - foreach (var elem in NotificationShape) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in DerivedFromElement) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in ResourceTrigger) { if (elem != null) yield return new ElementValue("resourceTrigger", elem); } - foreach (var elem in EventTrigger) { if (elem != null) yield return new ElementValue("eventTrigger", elem); } - foreach (var elem in CanFilterBy) { if (elem != null) yield return new ElementValue("canFilterBy", elem); } - foreach (var elem in NotificationShape) { if (elem != null) yield return new ElementValue("notificationShape", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2377,7 +2183,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2453,7 +2259,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs b/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs index b1144ba843..a70ad16447 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Substance.cs @@ -205,31 +205,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (ExpiryElement != null) yield return ExpiryElement; - if (Quantity != null) yield return Quantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (ExpiryElement != null) yield return new ElementValue("expiry", ExpiryElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -248,7 +224,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -267,7 +243,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -369,29 +345,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Substance != null) yield return Substance; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Substance != null) yield return new ElementValue("substance", Substance); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -407,7 +361,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -423,7 +377,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -630,39 +584,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -693,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -724,7 +646,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs index 82cf699c0d..0910b32e31 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SubstanceDefinition.cs @@ -277,41 +277,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (Stereochemistry != null) yield return Stereochemistry; - if (OpticalActivity != null) yield return OpticalActivity; - if (MolecularFormulaElement != null) yield return MolecularFormulaElement; - if (Amount != null) yield return Amount; - if (MeasurementType != null) yield return MeasurementType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Stereochemistry != null) yield return new ElementValue("stereochemistry", Stereochemistry); - if (OpticalActivity != null) yield return new ElementValue("opticalActivity", OpticalActivity); - if (MolecularFormulaElement != null) yield return new ElementValue("molecularFormula", MolecularFormulaElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (MeasurementType != null) yield return new ElementValue("measurementType", MeasurementType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -345,7 +311,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -379,7 +345,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -482,29 +448,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -520,7 +464,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -536,7 +480,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -651,31 +595,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Method != null) yield return Method; - if (Type != null) yield return Type; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Method != null) yield return new ElementValue("method", Method); - if (Type != null) yield return new ElementValue("type", Type); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -694,7 +614,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -713,7 +633,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Method is not null) yield return new KeyValuePair("method",Method); @@ -947,41 +867,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Stereochemistry != null) yield return Stereochemistry; - if (OpticalActivity != null) yield return OpticalActivity; - if (MolecularFormulaElement != null) yield return MolecularFormulaElement; - if (MolecularFormulaByMoietyElement != null) yield return MolecularFormulaByMoietyElement; - if (MolecularWeight != null) yield return MolecularWeight; - foreach (var elem in Technique) { if (elem != null) yield return elem; } - foreach (var elem in SourceDocument) { if (elem != null) yield return elem; } - foreach (var elem in Representation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Stereochemistry != null) yield return new ElementValue("stereochemistry", Stereochemistry); - if (OpticalActivity != null) yield return new ElementValue("opticalActivity", OpticalActivity); - if (MolecularFormulaElement != null) yield return new ElementValue("molecularFormula", MolecularFormulaElement); - if (MolecularFormulaByMoietyElement != null) yield return new ElementValue("molecularFormulaByMoiety", MolecularFormulaByMoietyElement); - if (MolecularWeight != null) yield return new ElementValue("molecularWeight", MolecularWeight); - foreach (var elem in Technique) { if (elem != null) yield return new ElementValue("technique", elem); } - foreach (var elem in SourceDocument) { if (elem != null) yield return new ElementValue("sourceDocument", elem); } - foreach (var elem in Representation) { if (elem != null) yield return new ElementValue("representation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1015,7 +901,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1049,7 +935,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Stereochemistry is not null) yield return new KeyValuePair("stereochemistry",Stereochemistry); @@ -1202,33 +1088,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (RepresentationElement != null) yield return RepresentationElement; - if (Format != null) yield return Format; - if (Document != null) yield return Document; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (RepresentationElement != null) yield return new ElementValue("representation", RepresentationElement); - if (Format != null) yield return new ElementValue("format", Format); - if (Document != null) yield return new ElementValue("document", Document); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1250,7 +1110,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1272,7 +1132,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1438,35 +1298,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1491,7 +1323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1516,7 +1348,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1807,47 +1639,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - if (Status != null) yield return Status; - if (PreferredElement != null) yield return PreferredElement; - foreach (var elem in Language) { if (elem != null) yield return elem; } - foreach (var elem in Domain) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in Synonym) { if (elem != null) yield return elem; } - foreach (var elem in Translation) { if (elem != null) yield return elem; } - foreach (var elem in Official) { if (elem != null) yield return elem; } - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Status != null) yield return new ElementValue("status", Status); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - foreach (var elem in Language) { if (elem != null) yield return new ElementValue("language", elem); } - foreach (var elem in Domain) { if (elem != null) yield return new ElementValue("domain", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in Synonym) { if (elem != null) yield return new ElementValue("synonym", elem); } - foreach (var elem in Translation) { if (elem != null) yield return new ElementValue("translation", elem); } - foreach (var elem in Official) { if (elem != null) yield return new ElementValue("official", elem); } - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1890,7 +1682,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1933,7 +1725,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2071,31 +1863,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Authority != null) yield return Authority; - if (Status != null) yield return Status; - if (DateElement != null) yield return DateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Authority != null) yield return new ElementValue("authority", Authority); - if (Status != null) yield return new ElementValue("status", Status); - if (DateElement != null) yield return new ElementValue("date", DateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2114,7 +1882,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2133,7 +1901,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Authority is not null) yield return new KeyValuePair("authority",Authority); @@ -2339,39 +2107,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SubstanceDefinition != null) yield return SubstanceDefinition; - if (Type != null) yield return Type; - if (IsDefiningElement != null) yield return IsDefiningElement; - if (Amount != null) yield return Amount; - if (RatioHighLimitAmount != null) yield return RatioHighLimitAmount; - if (Comparator != null) yield return Comparator; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SubstanceDefinition != null) yield return new ElementValue("substanceDefinition", SubstanceDefinition); - if (Type != null) yield return new ElementValue("type", Type); - if (IsDefiningElement != null) yield return new ElementValue("isDefining", IsDefiningElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (RatioHighLimitAmount != null) yield return new ElementValue("ratioHighLimitAmount", RatioHighLimitAmount); - if (Comparator != null) yield return new ElementValue("comparator", Comparator); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2402,7 +2138,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2433,7 +2169,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SubstanceDefinition is not null) yield return new KeyValuePair("substanceDefinition",SubstanceDefinition); @@ -2588,35 +2324,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Genus != null) yield return Genus; - if (Species != null) yield return Species; - if (Part != null) yield return Part; - foreach (var elem in CountryOfOrigin) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Genus != null) yield return new ElementValue("genus", Genus); - if (Species != null) yield return new ElementValue("species", Species); - if (Part != null) yield return new ElementValue("part", Part); - foreach (var elem in CountryOfOrigin) { if (elem != null) yield return new ElementValue("countryOfOrigin", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2641,7 +2349,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2666,7 +2374,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -3081,63 +2789,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (Status != null) yield return Status; - foreach (var elem in Classification) { if (elem != null) yield return elem; } - if (Domain != null) yield return Domain; - foreach (var elem in Grade) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in InformationSource) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in Supplier) { if (elem != null) yield return elem; } - foreach (var elem in Moiety) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in MolecularWeight) { if (elem != null) yield return elem; } - if (Structure != null) yield return Structure; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - if (SourceMaterial != null) yield return SourceMaterial; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (Status != null) yield return new ElementValue("status", Status); - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - if (Domain != null) yield return new ElementValue("domain", Domain); - foreach (var elem in Grade) { if (elem != null) yield return new ElementValue("grade", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in InformationSource) { if (elem != null) yield return new ElementValue("informationSource", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in Supplier) { if (elem != null) yield return new ElementValue("supplier", elem); } - foreach (var elem in Moiety) { if (elem != null) yield return new ElementValue("moiety", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in MolecularWeight) { if (elem != null) yield return new ElementValue("molecularWeight", elem); } - if (Structure != null) yield return new ElementValue("structure", Structure); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - if (SourceMaterial != null) yield return new ElementValue("sourceMaterial", SourceMaterial); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3204,7 +2856,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3271,7 +2923,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs index 14caa83802..3c1350749b 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SupplyDelivery.cs @@ -206,29 +206,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -244,7 +222,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -260,7 +238,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -525,47 +503,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (Type != null) yield return Type; - if (SuppliedItem != null) yield return SuppliedItem; - if (Occurrence != null) yield return Occurrence; - if (Supplier != null) yield return Supplier; - if (Destination != null) yield return Destination; - foreach (var elem in Receiver) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Type != null) yield return new ElementValue("type", Type); - if (SuppliedItem != null) yield return new ElementValue("suppliedItem", SuppliedItem); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (Supplier != null) yield return new ElementValue("supplier", Supplier); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Receiver) { if (elem != null) yield return new ElementValue("receiver", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -608,7 +546,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -651,7 +589,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs index f498b0db21..8e6d440e27 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/SupplyRequest.cs @@ -201,29 +201,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -239,7 +217,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -255,7 +233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -628,55 +606,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Category != null) yield return Category; - if (PriorityElement != null) yield return PriorityElement; - if (Item != null) yield return Item; - if (Quantity != null) yield return Quantity; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - foreach (var elem in Supplier) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (DeliverFrom != null) yield return DeliverFrom; - if (DeliverTo != null) yield return DeliverTo; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Category != null) yield return new ElementValue("category", Category); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Item != null) yield return new ElementValue("item", Item); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in Supplier) { if (elem != null) yield return new ElementValue("supplier", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (DeliverFrom != null) yield return new ElementValue("deliverFrom", DeliverFrom); - if (DeliverTo != null) yield return new ElementValue("deliverTo", DeliverTo); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -731,7 +661,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -786,7 +716,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Task.cs b/src/Hl7.Fhir.R4B/Model/Generated/Task.cs index cdec518284..f7c2829a7c 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Task.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Task.cs @@ -326,31 +326,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RepetitionsElement != null) yield return RepetitionsElement; - if (Period != null) yield return Period; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RepetitionsElement != null) yield return new ElementValue("repetitions", RepetitionsElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +345,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -388,7 +364,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RepetitionsElement is not null) yield return new KeyValuePair("repetitions",RepetitionsElement); @@ -490,29 +466,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -528,7 +482,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -544,7 +498,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -645,29 +599,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -683,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -699,7 +631,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1433,87 +1365,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (InstantiatesCanonicalElement != null) yield return InstantiatesCanonicalElement; - if (InstantiatesUriElement != null) yield return InstantiatesUriElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (BusinessStatus != null) yield return BusinessStatus; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Focus != null) yield return Focus; - if (For != null) yield return For; - if (Encounter != null) yield return Encounter; - if (ExecutionPeriod != null) yield return ExecutionPeriod; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (LastModifiedElement != null) yield return LastModifiedElement; - if (Requester != null) yield return Requester; - foreach (var elem in PerformerType) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - if (Location != null) yield return Location; - if (ReasonCode != null) yield return ReasonCode; - if (ReasonReference != null) yield return ReasonReference; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - if (Restriction != null) yield return Restriction; - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (InstantiatesCanonicalElement != null) yield return new ElementValue("instantiatesCanonical", InstantiatesCanonicalElement); - if (InstantiatesUriElement != null) yield return new ElementValue("instantiatesUri", InstantiatesUriElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (BusinessStatus != null) yield return new ElementValue("businessStatus", BusinessStatus); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Focus != null) yield return new ElementValue("focus", Focus); - if (For != null) yield return new ElementValue("for", For); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (ExecutionPeriod != null) yield return new ElementValue("executionPeriod", ExecutionPeriod); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (LastModifiedElement != null) yield return new ElementValue("lastModified", LastModifiedElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in PerformerType) { if (elem != null) yield return new ElementValue("performerType", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - if (Location != null) yield return new ElementValue("location", Location); - if (ReasonCode != null) yield return new ElementValue("reasonCode", ReasonCode); - if (ReasonReference != null) yield return new ElementValue("reasonReference", ReasonReference); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - if (Restriction != null) yield return new ElementValue("restriction", Restriction); - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1616,7 +1468,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1719,7 +1571,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs index e79c8172a3..9c1624f5d5 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/TerminologyCapabilities.cs @@ -205,29 +205,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -243,7 +221,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -259,7 +237,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -392,29 +370,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -430,7 +386,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -446,7 +402,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -596,31 +552,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UriElement != null) yield return UriElement; - foreach (var elem in Version) { if (elem != null) yield return elem; } - if (SubsumptionElement != null) yield return SubsumptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UriElement != null) yield return new ElementValue("uri", UriElement); - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - if (SubsumptionElement != null) yield return new ElementValue("subsumption", SubsumptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -639,7 +571,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -658,7 +590,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UriElement is not null) yield return new KeyValuePair("uri",UriElement); @@ -913,37 +845,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (IsDefaultElement != null) yield return IsDefaultElement; - if (CompositionalElement != null) yield return CompositionalElement; - foreach (var elem in LanguageElement) { if (elem != null) yield return elem; } - foreach (var elem in Filter) { if (elem != null) yield return elem; } - foreach (var elem in PropertyElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (IsDefaultElement != null) yield return new ElementValue("isDefault", IsDefaultElement); - if (CompositionalElement != null) yield return new ElementValue("compositional", CompositionalElement); - foreach (var elem in LanguageElement) { if (elem != null) yield return new ElementValue("language", elem); } - foreach (var elem in Filter) { if (elem != null) yield return new ElementValue("filter", elem); } - foreach (var elem in PropertyElement) { if (elem != null) yield return new ElementValue("property", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -971,7 +873,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -999,7 +901,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1134,29 +1036,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in OpElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in OpElement) { if (elem != null) yield return new ElementValue("op", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1172,7 +1052,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1188,7 +1068,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1402,35 +1282,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (HierarchicalElement != null) yield return HierarchicalElement; - if (PagingElement != null) yield return PagingElement; - if (IncompleteElement != null) yield return IncompleteElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (TextFilterElement != null) yield return TextFilterElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (HierarchicalElement != null) yield return new ElementValue("hierarchical", HierarchicalElement); - if (PagingElement != null) yield return new ElementValue("paging", PagingElement); - if (IncompleteElement != null) yield return new ElementValue("incomplete", IncompleteElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (TextFilterElement != null) yield return new ElementValue("textFilter", TextFilterElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1455,7 +1307,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1480,7 +1332,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (HierarchicalElement is not null) yield return new KeyValuePair("hierarchical",HierarchicalElement); @@ -1613,29 +1465,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1651,7 +1481,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1667,7 +1497,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1763,27 +1593,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TranslationsElement != null) yield return TranslationsElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TranslationsElement != null) yield return new ElementValue("translations", TranslationsElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1796,7 +1606,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1809,7 +1619,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TranslationsElement is not null) yield return new KeyValuePair("translations",TranslationsElement); @@ -1904,27 +1714,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NeedsMapElement != null) yield return NeedsMapElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NeedsMapElement != null) yield return new ElementValue("needsMap", NeedsMapElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1937,7 +1727,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1950,7 +1740,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NeedsMapElement is not null) yield return new KeyValuePair("needsMap",NeedsMapElement); @@ -2047,27 +1837,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TranslationElement != null) yield return TranslationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TranslationElement != null) yield return new ElementValue("translation", TranslationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2080,7 +1850,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2093,7 +1863,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TranslationElement is not null) yield return new KeyValuePair("translation",TranslationElement); @@ -2790,73 +2560,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (KindElement != null) yield return KindElement; - if (Software != null) yield return Software; - if (Implementation != null) yield return Implementation; - if (LockedDateElement != null) yield return LockedDateElement; - foreach (var elem in CodeSystem) { if (elem != null) yield return elem; } - if (Expansion != null) yield return Expansion; - if (CodeSearchElement != null) yield return CodeSearchElement; - if (ValidateCode != null) yield return ValidateCode; - if (Translation != null) yield return Translation; - if (Closure != null) yield return Closure; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Software != null) yield return new ElementValue("software", Software); - if (Implementation != null) yield return new ElementValue("implementation", Implementation); - if (LockedDateElement != null) yield return new ElementValue("lockedDate", LockedDateElement); - foreach (var elem in CodeSystem) { if (elem != null) yield return new ElementValue("codeSystem", elem); } - if (Expansion != null) yield return new ElementValue("expansion", Expansion); - if (CodeSearchElement != null) yield return new ElementValue("codeSearch", CodeSearchElement); - if (ValidateCode != null) yield return new ElementValue("validateCode", ValidateCode); - if (Translation != null) yield return new ElementValue("translation", Translation); - if (Closure != null) yield return new ElementValue("closure", Closure); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2938,7 +2642,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3020,7 +2724,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs index 03210719cb..bbbb2ce5c1 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/TestReport.cs @@ -353,31 +353,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (UriElement != null) yield return UriElement; - if (DisplayElement != null) yield return DisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -396,7 +372,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -415,7 +391,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -494,27 +470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -527,7 +483,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -540,7 +496,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -636,29 +592,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -674,7 +608,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -690,7 +624,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -859,31 +793,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResultElement != null) yield return ResultElement; - if (MessageElement != null) yield return MessageElement; - if (DetailElement != null) yield return DetailElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -902,7 +812,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -921,7 +831,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResultElement is not null) yield return new KeyValuePair("result",ResultElement); @@ -1091,31 +1001,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResultElement != null) yield return ResultElement; - if (MessageElement != null) yield return MessageElement; - if (DetailElement != null) yield return DetailElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1134,7 +1020,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1153,7 +1039,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResultElement is not null) yield return new KeyValuePair("result",ResultElement); @@ -1300,31 +1186,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1343,7 +1205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1362,7 +1224,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1460,29 +1322,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1498,7 +1338,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1514,7 +1354,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -1595,27 +1435,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1628,7 +1448,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1641,7 +1461,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -1722,27 +1542,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1755,7 +1555,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1768,7 +1568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -2128,49 +1928,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (TestScript != null) yield return TestScript; - if (ResultElement != null) yield return ResultElement; - if (ScoreElement != null) yield return ScoreElement; - if (TesterElement != null) yield return TesterElement; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Setup != null) yield return Setup; - foreach (var elem in Test) { if (elem != null) yield return elem; } - if (Teardown != null) yield return Teardown; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TestScript != null) yield return new ElementValue("testScript", TestScript); - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (ScoreElement != null) yield return new ElementValue("score", ScoreElement); - if (TesterElement != null) yield return new ElementValue("tester", TesterElement); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Setup != null) yield return new ElementValue("setup", Setup); - foreach (var elem in Test) { if (elem != null) yield return new ElementValue("test", elem); } - if (Teardown != null) yield return new ElementValue("teardown", Teardown); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2216,7 +1974,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2262,7 +2020,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs index 23645e3568..df932ab394 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/TestScript.cs @@ -400,29 +400,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IndexElement != null) yield return IndexElement; - if (Profile != null) yield return Profile; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IndexElement != null) yield return new ElementValue("index", IndexElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -438,7 +416,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -454,7 +432,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IndexElement is not null) yield return new KeyValuePair("index",IndexElement); @@ -572,29 +550,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IndexElement != null) yield return IndexElement; - if (Profile != null) yield return Profile; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IndexElement != null) yield return new ElementValue("index", IndexElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -610,7 +566,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -626,7 +582,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IndexElement is not null) yield return new KeyValuePair("index",IndexElement); @@ -724,29 +680,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Link) { if (elem != null) yield return elem; } - foreach (var elem in Capability) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - foreach (var elem in Capability) { if (elem != null) yield return new ElementValue("capability", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -762,7 +696,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -778,7 +712,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Link?.Any() == true) yield return new KeyValuePair("link",Link); @@ -911,29 +845,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -949,7 +861,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -965,7 +877,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); @@ -1273,39 +1185,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RequiredElement != null) yield return RequiredElement; - if (ValidatedElement != null) yield return ValidatedElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in OriginElement) { if (elem != null) yield return elem; } - if (DestinationElement != null) yield return DestinationElement; - foreach (var elem in LinkElement) { if (elem != null) yield return elem; } - if (CapabilitiesElement != null) yield return CapabilitiesElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (ValidatedElement != null) yield return new ElementValue("validated", ValidatedElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in OriginElement) { if (elem != null) yield return new ElementValue("origin", elem); } - if (DestinationElement != null) yield return new ElementValue("destination", DestinationElement); - foreach (var elem in LinkElement) { if (elem != null) yield return new ElementValue("link", elem); } - if (CapabilitiesElement != null) yield return new ElementValue("capabilities", CapabilitiesElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1336,7 +1216,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1367,7 +1247,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RequiredElement is not null) yield return new KeyValuePair("required",RequiredElement); @@ -1524,31 +1404,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AutocreateElement != null) yield return AutocreateElement; - if (AutodeleteElement != null) yield return AutodeleteElement; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AutocreateElement != null) yield return new ElementValue("autocreate", AutocreateElement); - if (AutodeleteElement != null) yield return new ElementValue("autodelete", AutodeleteElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1567,7 +1423,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1586,7 +1442,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AutocreateElement is not null) yield return new KeyValuePair("autocreate",AutocreateElement); @@ -1925,41 +1781,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DefaultValueElement != null) yield return DefaultValueElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (HeaderFieldElement != null) yield return HeaderFieldElement; - if (HintElement != null) yield return HintElement; - if (PathElement != null) yield return PathElement; - if (SourceIdElement != null) yield return SourceIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DefaultValueElement != null) yield return new ElementValue("defaultValue", DefaultValueElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (HeaderFieldElement != null) yield return new ElementValue("headerField", HeaderFieldElement); - if (HintElement != null) yield return new ElementValue("hint", HintElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1993,7 +1815,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2027,7 +1849,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2111,27 +1933,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2144,7 +1946,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2157,7 +1959,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -2253,29 +2055,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2291,7 +2071,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2307,7 +2087,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -2922,59 +2702,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ResourceElement != null) yield return ResourceElement; - if (LabelElement != null) yield return LabelElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (AcceptElement != null) yield return AcceptElement; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (DestinationElement != null) yield return DestinationElement; - if (EncodeRequestUrlElement != null) yield return EncodeRequestUrlElement; - if (MethodElement != null) yield return MethodElement; - if (OriginElement != null) yield return OriginElement; - if (ParamsElement != null) yield return ParamsElement; - foreach (var elem in RequestHeader) { if (elem != null) yield return elem; } - if (RequestIdElement != null) yield return RequestIdElement; - if (ResponseIdElement != null) yield return ResponseIdElement; - if (SourceIdElement != null) yield return SourceIdElement; - if (TargetIdElement != null) yield return TargetIdElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (AcceptElement != null) yield return new ElementValue("accept", AcceptElement); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (DestinationElement != null) yield return new ElementValue("destination", DestinationElement); - if (EncodeRequestUrlElement != null) yield return new ElementValue("encodeRequestUrl", EncodeRequestUrlElement); - if (MethodElement != null) yield return new ElementValue("method", MethodElement); - if (OriginElement != null) yield return new ElementValue("origin", OriginElement); - if (ParamsElement != null) yield return new ElementValue("params", ParamsElement); - foreach (var elem in RequestHeader) { if (elem != null) yield return new ElementValue("requestHeader", elem); } - if (RequestIdElement != null) yield return new ElementValue("requestId", RequestIdElement); - if (ResponseIdElement != null) yield return new ElementValue("responseId", ResponseIdElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - if (TargetIdElement != null) yield return new ElementValue("targetId", TargetIdElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3035,7 +2763,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3096,7 +2824,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -3246,29 +2974,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FieldElement != null) yield return FieldElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FieldElement != null) yield return new ElementValue("field", FieldElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3284,7 +2990,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3300,7 +3006,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FieldElement is not null) yield return new KeyValuePair("field",FieldElement); @@ -4125,69 +3831,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LabelElement != null) yield return LabelElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (DirectionElement != null) yield return DirectionElement; - if (CompareToSourceIdElement != null) yield return CompareToSourceIdElement; - if (CompareToSourceExpressionElement != null) yield return CompareToSourceExpressionElement; - if (CompareToSourcePathElement != null) yield return CompareToSourcePathElement; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (HeaderFieldElement != null) yield return HeaderFieldElement; - if (MinimumIdElement != null) yield return MinimumIdElement; - if (NavigationLinksElement != null) yield return NavigationLinksElement; - if (OperatorElement != null) yield return OperatorElement; - if (PathElement != null) yield return PathElement; - if (RequestMethodElement != null) yield return RequestMethodElement; - if (RequestURLElement != null) yield return RequestURLElement; - if (ResourceElement != null) yield return ResourceElement; - if (ResponseElement != null) yield return ResponseElement; - if (ResponseCodeElement != null) yield return ResponseCodeElement; - if (SourceIdElement != null) yield return SourceIdElement; - if (ValidateProfileIdElement != null) yield return ValidateProfileIdElement; - if (ValueElement != null) yield return ValueElement; - if (WarningOnlyElement != null) yield return WarningOnlyElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (DirectionElement != null) yield return new ElementValue("direction", DirectionElement); - if (CompareToSourceIdElement != null) yield return new ElementValue("compareToSourceId", CompareToSourceIdElement); - if (CompareToSourceExpressionElement != null) yield return new ElementValue("compareToSourceExpression", CompareToSourceExpressionElement); - if (CompareToSourcePathElement != null) yield return new ElementValue("compareToSourcePath", CompareToSourcePathElement); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (HeaderFieldElement != null) yield return new ElementValue("headerField", HeaderFieldElement); - if (MinimumIdElement != null) yield return new ElementValue("minimumId", MinimumIdElement); - if (NavigationLinksElement != null) yield return new ElementValue("navigationLinks", NavigationLinksElement); - if (OperatorElement != null) yield return new ElementValue("operator", OperatorElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (RequestMethodElement != null) yield return new ElementValue("requestMethod", RequestMethodElement); - if (RequestURLElement != null) yield return new ElementValue("requestURL", RequestURLElement); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (ResponseElement != null) yield return new ElementValue("response", ResponseElement); - if (ResponseCodeElement != null) yield return new ElementValue("responseCode", ResponseCodeElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - if (ValidateProfileIdElement != null) yield return new ElementValue("validateProfileId", ValidateProfileIdElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (WarningOnlyElement != null) yield return new ElementValue("warningOnly", WarningOnlyElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4263,7 +3907,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4339,7 +3983,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LabelElement is not null) yield return new KeyValuePair("label",LabelElement); @@ -4505,31 +4149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4548,7 +4168,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4567,7 +4187,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -4665,29 +4285,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4703,7 +4301,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4719,7 +4317,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -4800,27 +4398,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4833,7 +4411,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4846,7 +4424,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -4927,27 +4505,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4960,7 +4518,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4973,7 +4531,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -5621,73 +5179,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in Origin) { if (elem != null) yield return elem; } - foreach (var elem in Destination) { if (elem != null) yield return elem; } - if (Metadata != null) yield return Metadata; - foreach (var elem in Fixture) { if (elem != null) yield return elem; } - foreach (var elem in Profile) { if (elem != null) yield return elem; } - foreach (var elem in Variable) { if (elem != null) yield return elem; } - if (Setup != null) yield return Setup; - foreach (var elem in Test) { if (elem != null) yield return elem; } - if (Teardown != null) yield return Teardown; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in Origin) { if (elem != null) yield return new ElementValue("origin", elem); } - foreach (var elem in Destination) { if (elem != null) yield return new ElementValue("destination", elem); } - if (Metadata != null) yield return new ElementValue("metadata", Metadata); - foreach (var elem in Fixture) { if (elem != null) yield return new ElementValue("fixture", elem); } - foreach (var elem in Profile) { if (elem != null) yield return new ElementValue("profile", elem); } - foreach (var elem in Variable) { if (elem != null) yield return new ElementValue("variable", elem); } - if (Setup != null) yield return new ElementValue("setup", Setup); - foreach (var elem in Test) { if (elem != null) yield return new ElementValue("test", elem); } - if (Teardown != null) yield return new ElementValue("teardown", Teardown); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5769,7 +5261,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5851,7 +5343,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs b/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs index 019d7fcef4..4fa6d89488 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/Timing.cs @@ -839,55 +839,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Bounds != null) yield return Bounds; - if (CountElement != null) yield return CountElement; - if (CountMaxElement != null) yield return CountMaxElement; - if (DurationElement != null) yield return DurationElement; - if (DurationMaxElement != null) yield return DurationMaxElement; - if (DurationUnitElement != null) yield return DurationUnitElement; - if (FrequencyElement != null) yield return FrequencyElement; - if (FrequencyMaxElement != null) yield return FrequencyMaxElement; - if (PeriodElement != null) yield return PeriodElement; - if (PeriodMaxElement != null) yield return PeriodMaxElement; - if (PeriodUnitElement != null) yield return PeriodUnitElement; - foreach (var elem in DayOfWeekElement) { if (elem != null) yield return elem; } - foreach (var elem in TimeOfDayElement) { if (elem != null) yield return elem; } - foreach (var elem in WhenElement) { if (elem != null) yield return elem; } - if (OffsetElement != null) yield return OffsetElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Bounds != null) yield return new ElementValue("bounds", Bounds); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (CountMaxElement != null) yield return new ElementValue("countMax", CountMaxElement); - if (DurationElement != null) yield return new ElementValue("duration", DurationElement); - if (DurationMaxElement != null) yield return new ElementValue("durationMax", DurationMaxElement); - if (DurationUnitElement != null) yield return new ElementValue("durationUnit", DurationUnitElement); - if (FrequencyElement != null) yield return new ElementValue("frequency", FrequencyElement); - if (FrequencyMaxElement != null) yield return new ElementValue("frequencyMax", FrequencyMaxElement); - if (PeriodElement != null) yield return new ElementValue("period", PeriodElement); - if (PeriodMaxElement != null) yield return new ElementValue("periodMax", PeriodMaxElement); - if (PeriodUnitElement != null) yield return new ElementValue("periodUnit", PeriodUnitElement); - foreach (var elem in DayOfWeekElement) { if (elem != null) yield return new ElementValue("dayOfWeek", elem); } - foreach (var elem in TimeOfDayElement) { if (elem != null) yield return new ElementValue("timeOfDay", elem); } - foreach (var elem in WhenElement) { if (elem != null) yield return new ElementValue("when", elem); } - if (OffsetElement != null) yield return new ElementValue("offset", OffsetElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -942,7 +894,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -997,7 +949,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Bounds is not null) yield return new KeyValuePair("bounds",Bounds); @@ -1126,31 +1078,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in EventElement) { if (elem != null) yield return elem; } - if (Repeat != null) yield return Repeat; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in EventElement) { if (elem != null) yield return new ElementValue("event", elem); } - if (Repeat != null) yield return new ElementValue("repeat", Repeat); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1169,7 +1097,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1188,7 +1116,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (EventElement?.Any() == true) yield return new KeyValuePair("event",EventElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/TriggerDefinition.cs b/src/Hl7.Fhir.R4B/Model/Generated/TriggerDefinition.cs index 4a34f4b1dd..212e382aaf 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/TriggerDefinition.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/TriggerDefinition.cs @@ -280,35 +280,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - if (Timing != null) yield return Timing; - foreach (var elem in Data) { if (elem != null) yield return elem; } - if (Condition != null) yield return Condition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - foreach (var elem in Data) { if (elem != null) yield return new ElementValue("data", elem); } - if (Condition != null) yield return new ElementValue("condition", Condition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -333,7 +305,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -358,7 +330,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs index 84bb7be7d1..bc87fbd786 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/VerificationResult.cs @@ -294,39 +294,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Who != null) yield return Who; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in CommunicationMethod) { if (elem != null) yield return elem; } - if (ValidationStatus != null) yield return ValidationStatus; - if (ValidationDateElement != null) yield return ValidationDateElement; - if (CanPushUpdates != null) yield return CanPushUpdates; - foreach (var elem in PushTypeAvailable) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Who != null) yield return new ElementValue("who", Who); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in CommunicationMethod) { if (elem != null) yield return new ElementValue("communicationMethod", elem); } - if (ValidationStatus != null) yield return new ElementValue("validationStatus", ValidationStatus); - if (ValidationDateElement != null) yield return new ElementValue("validationDate", ValidationDateElement); - if (CanPushUpdates != null) yield return new ElementValue("canPushUpdates", CanPushUpdates); - foreach (var elem in PushTypeAvailable) { if (elem != null) yield return new ElementValue("pushTypeAvailable", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -357,7 +325,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -388,7 +356,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Who is not null) yield return new KeyValuePair("who",Who); @@ -641,41 +609,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Who != null) yield return Who; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (CommunicationMethod != null) yield return CommunicationMethod; - if (DateElement != null) yield return DateElement; - if (SourceIdentityCertificateElement != null) yield return SourceIdentityCertificateElement; - if (ProxyIdentityCertificateElement != null) yield return ProxyIdentityCertificateElement; - if (ProxySignature != null) yield return ProxySignature; - if (SourceSignature != null) yield return SourceSignature; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Who != null) yield return new ElementValue("who", Who); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (CommunicationMethod != null) yield return new ElementValue("communicationMethod", CommunicationMethod); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (SourceIdentityCertificateElement != null) yield return new ElementValue("sourceIdentityCertificate", SourceIdentityCertificateElement); - if (ProxyIdentityCertificateElement != null) yield return new ElementValue("proxyIdentityCertificate", ProxyIdentityCertificateElement); - if (ProxySignature != null) yield return new ElementValue("proxySignature", ProxySignature); - if (SourceSignature != null) yield return new ElementValue("sourceSignature", SourceSignature); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -709,7 +643,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -743,7 +677,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Who is not null) yield return new KeyValuePair("who",Who); @@ -879,31 +813,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Organization != null) yield return Organization; - if (IdentityCertificateElement != null) yield return IdentityCertificateElement; - if (AttestationSignature != null) yield return AttestationSignature; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Organization != null) yield return new ElementValue("organization", Organization); - if (IdentityCertificateElement != null) yield return new ElementValue("identityCertificate", IdentityCertificateElement); - if (AttestationSignature != null) yield return new ElementValue("attestationSignature", AttestationSignature); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -922,7 +832,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -941,7 +851,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Organization is not null) yield return new KeyValuePair("organization",Organization); @@ -1318,53 +1228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Target) { if (elem != null) yield return elem; } - foreach (var elem in TargetLocationElement) { if (elem != null) yield return elem; } - if (Need != null) yield return Need; - if (StatusElement != null) yield return StatusElement; - if (StatusDateElement != null) yield return StatusDateElement; - if (ValidationType != null) yield return ValidationType; - foreach (var elem in ValidationProcess) { if (elem != null) yield return elem; } - if (Frequency != null) yield return Frequency; - if (LastPerformedElement != null) yield return LastPerformedElement; - if (NextScheduledElement != null) yield return NextScheduledElement; - if (FailureAction != null) yield return FailureAction; - foreach (var elem in PrimarySource) { if (elem != null) yield return elem; } - if (Attestation != null) yield return Attestation; - foreach (var elem in Validator) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - foreach (var elem in TargetLocationElement) { if (elem != null) yield return new ElementValue("targetLocation", elem); } - if (Need != null) yield return new ElementValue("need", Need); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (ValidationType != null) yield return new ElementValue("validationType", ValidationType); - foreach (var elem in ValidationProcess) { if (elem != null) yield return new ElementValue("validationProcess", elem); } - if (Frequency != null) yield return new ElementValue("frequency", Frequency); - if (LastPerformedElement != null) yield return new ElementValue("lastPerformed", LastPerformedElement); - if (NextScheduledElement != null) yield return new ElementValue("nextScheduled", NextScheduledElement); - if (FailureAction != null) yield return new ElementValue("failureAction", FailureAction); - foreach (var elem in PrimarySource) { if (elem != null) yield return new ElementValue("primarySource", elem); } - if (Attestation != null) yield return new ElementValue("attestation", Attestation); - foreach (var elem in Validator) { if (elem != null) yield return new ElementValue("validator", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1416,7 +1280,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1468,7 +1332,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target?.Any() == true) yield return new KeyValuePair("target",Target); diff --git a/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs index 9ff8590b27..a51f45aceb 100644 --- a/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs +++ b/src/Hl7.Fhir.R4B/Model/Generated/VisionPrescription.cs @@ -581,53 +581,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Product != null) yield return Product; - if (EyeElement != null) yield return EyeElement; - if (SphereElement != null) yield return SphereElement; - if (CylinderElement != null) yield return CylinderElement; - if (AxisElement != null) yield return AxisElement; - foreach (var elem in Prism) { if (elem != null) yield return elem; } - if (AddElement != null) yield return AddElement; - if (PowerElement != null) yield return PowerElement; - if (BackCurveElement != null) yield return BackCurveElement; - if (DiameterElement != null) yield return DiameterElement; - if (Duration != null) yield return Duration; - if (ColorElement != null) yield return ColorElement; - if (BrandElement != null) yield return BrandElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Product != null) yield return new ElementValue("product", Product); - if (EyeElement != null) yield return new ElementValue("eye", EyeElement); - if (SphereElement != null) yield return new ElementValue("sphere", SphereElement); - if (CylinderElement != null) yield return new ElementValue("cylinder", CylinderElement); - if (AxisElement != null) yield return new ElementValue("axis", AxisElement); - foreach (var elem in Prism) { if (elem != null) yield return new ElementValue("prism", elem); } - if (AddElement != null) yield return new ElementValue("add", AddElement); - if (PowerElement != null) yield return new ElementValue("power", PowerElement); - if (BackCurveElement != null) yield return new ElementValue("backCurve", BackCurveElement); - if (DiameterElement != null) yield return new ElementValue("diameter", DiameterElement); - if (Duration != null) yield return new ElementValue("duration", Duration); - if (ColorElement != null) yield return new ElementValue("color", ColorElement); - if (BrandElement != null) yield return new ElementValue("brand", BrandElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -679,7 +633,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -731,7 +685,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Product is not null) yield return new KeyValuePair("product",Product); @@ -879,29 +833,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AmountElement != null) yield return AmountElement; - if (BaseElement != null) yield return BaseElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AmountElement != null) yield return new ElementValue("amount", AmountElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -917,7 +849,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -933,7 +865,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AmountElement is not null) yield return new KeyValuePair("amount",AmountElement); @@ -1180,41 +1112,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CreatedElement != null) yield return CreatedElement; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (DateWrittenElement != null) yield return DateWrittenElement; - if (Prescriber != null) yield return Prescriber; - foreach (var elem in LensSpecification) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateWrittenElement != null) yield return new ElementValue("dateWritten", DateWrittenElement); - if (Prescriber != null) yield return new ElementValue("prescriber", Prescriber); - foreach (var elem in LensSpecification) { if (elem != null) yield return new ElementValue("lensSpecification", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1248,7 +1146,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1282,7 +1180,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Account.cs b/src/Hl7.Fhir.R5/Model/Generated/Account.cs index 3230d42e63..8bc4eeac09 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Account.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Account.cs @@ -209,29 +209,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Coverage != null) yield return Coverage; - if (PriorityElement != null) yield return PriorityElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -247,7 +225,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -263,7 +241,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coverage is not null) yield return new KeyValuePair("coverage",Coverage); @@ -396,31 +374,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Party != null) yield return Party; - if (OnHoldElement != null) yield return OnHoldElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Party != null) yield return new ElementValue("party", Party); - if (OnHoldElement != null) yield return new ElementValue("onHold", OnHoldElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -458,7 +412,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Party is not null) yield return new KeyValuePair("party",Party); @@ -679,37 +633,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Condition != null) yield return Condition; - if (DateOfDiagnosisElement != null) yield return DateOfDiagnosisElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (OnAdmissionElement != null) yield return OnAdmissionElement; - foreach (var elem in PackageCode) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Condition != null) yield return new ElementValue("condition", Condition); - if (DateOfDiagnosisElement != null) yield return new ElementValue("dateOfDiagnosis", DateOfDiagnosisElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (OnAdmissionElement != null) yield return new ElementValue("onAdmission", OnAdmissionElement); - foreach (var elem in PackageCode) { if (elem != null) yield return new ElementValue("packageCode", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -737,7 +661,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -765,7 +689,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -973,37 +897,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Code != null) yield return Code; - if (DateOfServiceElement != null) yield return DateOfServiceElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in PackageCode) { if (elem != null) yield return elem; } - foreach (var elem in Device) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DateOfServiceElement != null) yield return new ElementValue("dateOfService", DateOfServiceElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in PackageCode) { if (elem != null) yield return new ElementValue("packageCode", elem); } - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1031,7 +925,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1059,7 +953,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1160,29 +1054,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Relationship != null) yield return Relationship; - if (Account != null) yield return Account; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Account != null) yield return new ElementValue("account", Account); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1198,7 +1070,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1214,7 +1086,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Relationship is not null) yield return new KeyValuePair("relationship",Relationship); @@ -1364,33 +1236,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Aggregate != null) yield return Aggregate; - if (Term != null) yield return Term; - if (EstimateElement != null) yield return EstimateElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Aggregate != null) yield return new ElementValue("aggregate", Aggregate); - if (Term != null) yield return new ElementValue("term", Term); - if (EstimateElement != null) yield return new ElementValue("estimate", EstimateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1412,7 +1258,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1434,7 +1280,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Aggregate is not null) yield return new KeyValuePair("aggregate",Aggregate); @@ -1848,59 +1694,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (BillingStatus != null) yield return BillingStatus; - if (Type != null) yield return Type; - if (NameElement != null) yield return NameElement; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (ServicePeriod != null) yield return ServicePeriod; - foreach (var elem in Coverage) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Guarantor) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - foreach (var elem in RelatedAccount) { if (elem != null) yield return elem; } - if (Currency != null) yield return Currency; - foreach (var elem in Balance) { if (elem != null) yield return elem; } - if (CalculatedAtElement != null) yield return CalculatedAtElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (BillingStatus != null) yield return new ElementValue("billingStatus", BillingStatus); - if (Type != null) yield return new ElementValue("type", Type); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (ServicePeriod != null) yield return new ElementValue("servicePeriod", ServicePeriod); - foreach (var elem in Coverage) { if (elem != null) yield return new ElementValue("coverage", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Guarantor) { if (elem != null) yield return new ElementValue("guarantor", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - foreach (var elem in RelatedAccount) { if (elem != null) yield return new ElementValue("relatedAccount", elem); } - if (Currency != null) yield return new ElementValue("currency", Currency); - foreach (var elem in Balance) { if (elem != null) yield return new ElementValue("balance", elem); } - if (CalculatedAtElement != null) yield return new ElementValue("calculatedAt", CalculatedAtElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1961,7 +1755,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2022,7 +1816,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs index c7793d167f..675d8f9b85 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ActivityDefinition.cs @@ -348,35 +348,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (TypeCanonicalElement != null) yield return TypeCanonicalElement; - if (TypeReference != null) yield return TypeReference; - if (Role != null) yield return Role; - if (Function != null) yield return Function; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TypeCanonicalElement != null) yield return new ElementValue("typeCanonical", TypeCanonicalElement); - if (TypeReference != null) yield return new ElementValue("typeReference", TypeReference); - if (Role != null) yield return new ElementValue("role", Role); - if (Function != null) yield return new ElementValue("function", Function); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -401,7 +373,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -426,7 +398,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -546,29 +518,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -584,7 +534,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -600,7 +550,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -1948,123 +1898,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (KindElement != null) yield return KindElement; - if (ProfileElement != null) yield return ProfileElement; - if (Code != null) yield return Code; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Timing != null) yield return Timing; - if (AsNeeded != null) yield return AsNeeded; - if (Location != null) yield return Location; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Product != null) yield return Product; - if (Quantity != null) yield return Quantity; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in SpecimenRequirementElement) { if (elem != null) yield return elem; } - foreach (var elem in ObservationRequirementElement) { if (elem != null) yield return elem; } - foreach (var elem in ObservationResultRequirementElement) { if (elem != null) yield return elem; } - if (TransformElement != null) yield return TransformElement; - foreach (var elem in DynamicValue) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - if (Code != null) yield return new ElementValue("code", Code); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (AsNeeded != null) yield return new ElementValue("asNeeded", AsNeeded); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Product != null) yield return new ElementValue("product", Product); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in SpecimenRequirementElement) { if (elem != null) yield return new ElementValue("specimenRequirement", elem); } - foreach (var elem in ObservationRequirementElement) { if (elem != null) yield return new ElementValue("observationRequirement", elem); } - foreach (var elem in ObservationResultRequirementElement) { if (elem != null) yield return new ElementValue("observationResultRequirement", elem); } - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in DynamicValue) { if (elem != null) yield return new ElementValue("dynamicValue", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2221,7 +2055,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2378,7 +2212,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs index 3294b10b90..31dd7917f1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ActorDefinition.cs @@ -774,69 +774,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (TypeElement != null) yield return TypeElement; - if (DocumentationElement != null) yield return DocumentationElement; - foreach (var elem in ReferenceElement) { if (elem != null) yield return elem; } - if (CapabilitiesElement != null) yield return CapabilitiesElement; - foreach (var elem in DerivedFromElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - foreach (var elem in ReferenceElement) { if (elem != null) yield return new ElementValue("reference", elem); } - if (CapabilitiesElement != null) yield return new ElementValue("capabilities", CapabilitiesElement); - foreach (var elem in DerivedFromElement) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -912,7 +850,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -988,7 +926,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Address.cs b/src/Hl7.Fhir.R5/Model/Generated/Address.cs index 6ecb133d27..7e18391c2d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Address.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Address.cs @@ -495,45 +495,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in LineElement) { if (elem != null) yield return elem; } - if (CityElement != null) yield return CityElement; - if (DistrictElement != null) yield return DistrictElement; - if (StateElement != null) yield return StateElement; - if (PostalCodeElement != null) yield return PostalCodeElement; - if (CountryElement != null) yield return CountryElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LineElement) { if (elem != null) yield return new ElementValue("line", elem); } - if (CityElement != null) yield return new ElementValue("city", CityElement); - if (DistrictElement != null) yield return new ElementValue("district", DistrictElement); - if (StateElement != null) yield return new ElementValue("state", StateElement); - if (PostalCodeElement != null) yield return new ElementValue("postalCode", PostalCodeElement); - if (CountryElement != null) yield return new ElementValue("country", CountryElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -573,7 +535,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -613,7 +575,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs index e57806f883..76bc2875b6 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AdministrableProductDefinition.cs @@ -165,31 +165,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - if (Status != null) yield return Status; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - if (Status != null) yield return new ElementValue("status", Status); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -208,7 +184,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -227,7 +203,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -407,39 +383,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (FirstDose != null) yield return FirstDose; - if (MaxSingleDose != null) yield return MaxSingleDose; - if (MaxDosePerDay != null) yield return MaxDosePerDay; - if (MaxDosePerTreatmentPeriod != null) yield return MaxDosePerTreatmentPeriod; - if (MaxTreatmentPeriod != null) yield return MaxTreatmentPeriod; - foreach (var elem in TargetSpecies) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (FirstDose != null) yield return new ElementValue("firstDose", FirstDose); - if (MaxSingleDose != null) yield return new ElementValue("maxSingleDose", MaxSingleDose); - if (MaxDosePerDay != null) yield return new ElementValue("maxDosePerDay", MaxDosePerDay); - if (MaxDosePerTreatmentPeriod != null) yield return new ElementValue("maxDosePerTreatmentPeriod", MaxDosePerTreatmentPeriod); - if (MaxTreatmentPeriod != null) yield return new ElementValue("maxTreatmentPeriod", MaxTreatmentPeriod); - foreach (var elem in TargetSpecies) { if (elem != null) yield return new ElementValue("targetSpecies", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -470,7 +414,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -501,7 +445,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -602,29 +546,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in WithdrawalPeriod) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in WithdrawalPeriod) { if (elem != null) yield return new ElementValue("withdrawalPeriod", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -640,7 +562,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -656,7 +578,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -786,31 +708,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Tissue != null) yield return Tissue; - if (Value != null) yield return Value; - if (SupportingInformationElement != null) yield return SupportingInformationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Tissue != null) yield return new ElementValue("tissue", Tissue); - if (Value != null) yield return new ElementValue("value", Value); - if (SupportingInformationElement != null) yield return new ElementValue("supportingInformation", SupportingInformationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -829,7 +727,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -848,7 +746,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Tissue is not null) yield return new KeyValuePair("tissue",Tissue); @@ -1129,47 +1027,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in FormOf) { if (elem != null) yield return elem; } - if (AdministrableDoseForm != null) yield return AdministrableDoseForm; - if (UnitOfPresentation != null) yield return UnitOfPresentation; - foreach (var elem in ProducedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - if (Device != null) yield return Device; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in RouteOfAdministration) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in FormOf) { if (elem != null) yield return new ElementValue("formOf", elem); } - if (AdministrableDoseForm != null) yield return new ElementValue("administrableDoseForm", AdministrableDoseForm); - if (UnitOfPresentation != null) yield return new ElementValue("unitOfPresentation", UnitOfPresentation); - foreach (var elem in ProducedFrom) { if (elem != null) yield return new ElementValue("producedFrom", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - if (Device != null) yield return new ElementValue("device", Device); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in RouteOfAdministration) { if (elem != null) yield return new ElementValue("routeOfAdministration", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1212,7 +1070,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1255,7 +1113,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs index 2b88cf4f6b..a9247626a4 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AdverseEvent.cs @@ -206,29 +206,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -244,7 +222,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -260,7 +238,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -360,29 +338,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Instance != null) yield return Instance; - if (Causality != null) yield return Causality; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Instance != null) yield return new ElementValue("instance", Instance); - if (Causality != null) yield return new ElementValue("causality", Causality); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -398,7 +354,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -414,7 +370,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Instance is not null) yield return new KeyValuePair("instance",Instance); @@ -527,31 +483,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AssessmentMethod != null) yield return AssessmentMethod; - if (EntityRelatedness != null) yield return EntityRelatedness; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AssessmentMethod != null) yield return new ElementValue("assessmentMethod", AssessmentMethod); - if (EntityRelatedness != null) yield return new ElementValue("entityRelatedness", EntityRelatedness); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -570,7 +502,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -589,7 +521,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AssessmentMethod is not null) yield return new KeyValuePair("assessmentMethod",AssessmentMethod); @@ -675,27 +607,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -708,7 +620,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -721,7 +633,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -802,27 +714,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -835,7 +727,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -848,7 +740,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -932,27 +824,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -965,7 +837,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -978,7 +850,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -1059,27 +931,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1092,7 +944,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1105,7 +957,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -1665,73 +1517,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ActualityElement != null) yield return ActualityElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (DetectedElement != null) yield return DetectedElement; - if (RecordedDateElement != null) yield return RecordedDateElement; - foreach (var elem in ResultingEffect) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (Seriousness != null) yield return Seriousness; - foreach (var elem in Outcome) { if (elem != null) yield return elem; } - if (Recorder != null) yield return Recorder; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in Study) { if (elem != null) yield return elem; } - if (ExpectedInResearchStudyElement != null) yield return ExpectedInResearchStudyElement; - foreach (var elem in SuspectEntity) { if (elem != null) yield return elem; } - foreach (var elem in ContributingFactor) { if (elem != null) yield return elem; } - foreach (var elem in PreventiveAction) { if (elem != null) yield return elem; } - foreach (var elem in MitigatingAction) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ActualityElement != null) yield return new ElementValue("actuality", ActualityElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (DetectedElement != null) yield return new ElementValue("detected", DetectedElement); - if (RecordedDateElement != null) yield return new ElementValue("recordedDate", RecordedDateElement); - foreach (var elem in ResultingEffect) { if (elem != null) yield return new ElementValue("resultingEffect", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (Seriousness != null) yield return new ElementValue("seriousness", Seriousness); - foreach (var elem in Outcome) { if (elem != null) yield return new ElementValue("outcome", elem); } - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in Study) { if (elem != null) yield return new ElementValue("study", elem); } - if (ExpectedInResearchStudyElement != null) yield return new ElementValue("expectedInResearchStudy", ExpectedInResearchStudyElement); - foreach (var elem in SuspectEntity) { if (elem != null) yield return new ElementValue("suspectEntity", elem); } - foreach (var elem in ContributingFactor) { if (elem != null) yield return new ElementValue("contributingFactor", elem); } - foreach (var elem in PreventiveAction) { if (elem != null) yield return new ElementValue("preventiveAction", elem); } - foreach (var elem in MitigatingAction) { if (elem != null) yield return new ElementValue("mitigatingAction", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1813,7 +1599,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1895,7 +1681,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs index a533d020de..0da9588110 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AllergyIntolerance.cs @@ -309,29 +309,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -347,7 +325,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -363,7 +341,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -600,39 +578,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - foreach (var elem in Manifestation) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (OnsetElement != null) yield return OnsetElement; - if (SeverityElement != null) yield return SeverityElement; - if (ExposureRoute != null) yield return ExposureRoute; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - foreach (var elem in Manifestation) { if (elem != null) yield return new ElementValue("manifestation", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (OnsetElement != null) yield return new ElementValue("onset", OnsetElement); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (ExposureRoute != null) yield return new ElementValue("exposureRoute", ExposureRoute); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -663,7 +609,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -694,7 +640,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -1081,55 +1027,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ClinicalStatus != null) yield return ClinicalStatus; - if (VerificationStatus != null) yield return VerificationStatus; - if (Type != null) yield return Type; - foreach (var elem in CategoryElement) { if (elem != null) yield return elem; } - if (CriticalityElement != null) yield return CriticalityElement; - if (Code != null) yield return Code; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (Onset != null) yield return Onset; - if (RecordedDateElement != null) yield return RecordedDateElement; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (LastOccurrenceElement != null) yield return LastOccurrenceElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Reaction) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ClinicalStatus != null) yield return new ElementValue("clinicalStatus", ClinicalStatus); - if (VerificationStatus != null) yield return new ElementValue("verificationStatus", VerificationStatus); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in CategoryElement) { if (elem != null) yield return new ElementValue("category", elem); } - if (CriticalityElement != null) yield return new ElementValue("criticality", CriticalityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Onset != null) yield return new ElementValue("onset", Onset); - if (RecordedDateElement != null) yield return new ElementValue("recordedDate", RecordedDateElement); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (LastOccurrenceElement != null) yield return new ElementValue("lastOccurrence", LastOccurrenceElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Reaction) { if (elem != null) yield return new ElementValue("reaction", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1184,7 +1082,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1239,7 +1137,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs b/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs index 0a456a730d..44caaa660c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Annotation.cs @@ -187,31 +187,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Author != null) yield return Author; - if (TimeElement != null) yield return TimeElement; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Author != null) yield return new ElementValue("author", Author); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -230,7 +206,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -249,7 +225,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Author is not null) yield return new KeyValuePair("author",Author); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs b/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs index 8e2b95cde2..8063cca3d1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Appointment.cs @@ -3202,35 +3202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Actor != null) yield return Actor; - if (RequiredElement != null) yield return RequiredElement; - if (StatusElement != null) yield return StatusElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Actor != null) yield return new ElementValue("actor", Actor); - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3255,7 +3227,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3280,7 +3252,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -3603,45 +3575,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Timezone != null) yield return Timezone; - if (RecurrenceType != null) yield return RecurrenceType; - if (LastOccurrenceDateElement != null) yield return LastOccurrenceDateElement; - if (OccurrenceCountElement != null) yield return OccurrenceCountElement; - foreach (var elem in OccurrenceDateElement) { if (elem != null) yield return elem; } - if (WeeklyTemplate != null) yield return WeeklyTemplate; - if (MonthlyTemplate != null) yield return MonthlyTemplate; - if (YearlyTemplate != null) yield return YearlyTemplate; - foreach (var elem in ExcludingDateElement) { if (elem != null) yield return elem; } - foreach (var elem in ExcludingRecurrenceIdElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Timezone != null) yield return new ElementValue("timezone", Timezone); - if (RecurrenceType != null) yield return new ElementValue("recurrenceType", RecurrenceType); - if (LastOccurrenceDateElement != null) yield return new ElementValue("lastOccurrenceDate", LastOccurrenceDateElement); - if (OccurrenceCountElement != null) yield return new ElementValue("occurrenceCount", OccurrenceCountElement); - foreach (var elem in OccurrenceDateElement) { if (elem != null) yield return new ElementValue("occurrenceDate", elem); } - if (WeeklyTemplate != null) yield return new ElementValue("weeklyTemplate", WeeklyTemplate); - if (MonthlyTemplate != null) yield return new ElementValue("monthlyTemplate", MonthlyTemplate); - if (YearlyTemplate != null) yield return new ElementValue("yearlyTemplate", YearlyTemplate); - foreach (var elem in ExcludingDateElement) { if (elem != null) yield return new ElementValue("excludingDate", elem); } - foreach (var elem in ExcludingRecurrenceIdElement) { if (elem != null) yield return new ElementValue("excludingRecurrenceId", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3681,7 +3615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3721,7 +3655,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Timezone is not null) yield return new KeyValuePair("timezone",Timezone); @@ -4062,41 +3996,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MondayElement != null) yield return MondayElement; - if (TuesdayElement != null) yield return TuesdayElement; - if (WednesdayElement != null) yield return WednesdayElement; - if (ThursdayElement != null) yield return ThursdayElement; - if (FridayElement != null) yield return FridayElement; - if (SaturdayElement != null) yield return SaturdayElement; - if (SundayElement != null) yield return SundayElement; - if (WeekIntervalElement != null) yield return WeekIntervalElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MondayElement != null) yield return new ElementValue("monday", MondayElement); - if (TuesdayElement != null) yield return new ElementValue("tuesday", TuesdayElement); - if (WednesdayElement != null) yield return new ElementValue("wednesday", WednesdayElement); - if (ThursdayElement != null) yield return new ElementValue("thursday", ThursdayElement); - if (FridayElement != null) yield return new ElementValue("friday", FridayElement); - if (SaturdayElement != null) yield return new ElementValue("saturday", SaturdayElement); - if (SundayElement != null) yield return new ElementValue("sunday", SundayElement); - if (WeekIntervalElement != null) yield return new ElementValue("weekInterval", WeekIntervalElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4130,7 +4030,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4164,7 +4064,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MondayElement is not null) yield return new KeyValuePair("monday",MondayElement); @@ -4334,33 +4234,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DayOfMonthElement != null) yield return DayOfMonthElement; - if (NthWeekOfMonth != null) yield return NthWeekOfMonth; - if (DayOfWeek != null) yield return DayOfWeek; - if (MonthIntervalElement != null) yield return MonthIntervalElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DayOfMonthElement != null) yield return new ElementValue("dayOfMonth", DayOfMonthElement); - if (NthWeekOfMonth != null) yield return new ElementValue("nthWeekOfMonth", NthWeekOfMonth); - if (DayOfWeek != null) yield return new ElementValue("dayOfWeek", DayOfWeek); - if (MonthIntervalElement != null) yield return new ElementValue("monthInterval", MonthIntervalElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4382,7 +4256,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4404,7 +4278,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DayOfMonthElement is not null) yield return new KeyValuePair("dayOfMonth",DayOfMonthElement); @@ -4502,27 +4376,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (YearIntervalElement != null) yield return YearIntervalElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (YearIntervalElement != null) yield return new ElementValue("yearInterval", YearIntervalElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4535,7 +4389,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4548,7 +4402,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (YearIntervalElement is not null) yield return new KeyValuePair("yearInterval",YearIntervalElement); @@ -5315,89 +5169,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CancellationReason != null) yield return CancellationReason; - foreach (var elem in Class) { if (elem != null) yield return elem; } - foreach (var elem in ServiceCategory) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - if (AppointmentType != null) yield return AppointmentType; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (Priority != null) yield return Priority; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - foreach (var elem in VirtualService) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (PreviousAppointment != null) yield return PreviousAppointment; - if (OriginatingAppointment != null) yield return OriginatingAppointment; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (MinutesDurationElement != null) yield return MinutesDurationElement; - foreach (var elem in RequestedPeriod) { if (elem != null) yield return elem; } - foreach (var elem in Slot) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - if (CreatedElement != null) yield return CreatedElement; - if (CancellationDateElement != null) yield return CancellationDateElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in PatientInstruction) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (RecurrenceIdElement != null) yield return RecurrenceIdElement; - if (OccurrenceChangedElement != null) yield return OccurrenceChangedElement; - foreach (var elem in RecurrenceTemplate) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CancellationReason != null) yield return new ElementValue("cancellationReason", CancellationReason); - foreach (var elem in Class) { if (elem != null) yield return new ElementValue("class", elem); } - foreach (var elem in ServiceCategory) { if (elem != null) yield return new ElementValue("serviceCategory", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - if (AppointmentType != null) yield return new ElementValue("appointmentType", AppointmentType); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (Priority != null) yield return new ElementValue("priority", Priority); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - foreach (var elem in VirtualService) { if (elem != null) yield return new ElementValue("virtualService", elem); } - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (PreviousAppointment != null) yield return new ElementValue("previousAppointment", PreviousAppointment); - if (OriginatingAppointment != null) yield return new ElementValue("originatingAppointment", OriginatingAppointment); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (MinutesDurationElement != null) yield return new ElementValue("minutesDuration", MinutesDurationElement); - foreach (var elem in RequestedPeriod) { if (elem != null) yield return new ElementValue("requestedPeriod", elem); } - foreach (var elem in Slot) { if (elem != null) yield return new ElementValue("slot", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (CancellationDateElement != null) yield return new ElementValue("cancellationDate", CancellationDateElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in PatientInstruction) { if (elem != null) yield return new ElementValue("patientInstruction", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (RecurrenceIdElement != null) yield return new ElementValue("recurrenceId", RecurrenceIdElement); - if (OccurrenceChangedElement != null) yield return new ElementValue("occurrenceChanged", OccurrenceChangedElement); - foreach (var elem in RecurrenceTemplate) { if (elem != null) yield return new ElementValue("recurrenceTemplate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5503,7 +5275,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5609,7 +5381,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs index cea5320920..b58e0e6547 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AppointmentResponse.cs @@ -484,49 +484,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Appointment != null) yield return Appointment; - if (ProposedNewTimeElement != null) yield return ProposedNewTimeElement; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - foreach (var elem in ParticipantType) { if (elem != null) yield return elem; } - if (Actor != null) yield return Actor; - if (ParticipantStatusElement != null) yield return ParticipantStatusElement; - if (CommentElement != null) yield return CommentElement; - if (RecurringElement != null) yield return RecurringElement; - if (OccurrenceDateElement != null) yield return OccurrenceDateElement; - if (RecurrenceIdElement != null) yield return RecurrenceIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Appointment != null) yield return new ElementValue("appointment", Appointment); - if (ProposedNewTimeElement != null) yield return new ElementValue("proposedNewTime", ProposedNewTimeElement); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - foreach (var elem in ParticipantType) { if (elem != null) yield return new ElementValue("participantType", elem); } - if (Actor != null) yield return new ElementValue("actor", Actor); - if (ParticipantStatusElement != null) yield return new ElementValue("participantStatus", ParticipantStatusElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (RecurringElement != null) yield return new ElementValue("recurring", RecurringElement); - if (OccurrenceDateElement != null) yield return new ElementValue("occurrenceDate", OccurrenceDateElement); - if (RecurrenceIdElement != null) yield return new ElementValue("recurrenceId", RecurrenceIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -572,7 +530,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -618,7 +576,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs b/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs index 42f032a91a..86ca15e6f1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ArtifactAssessment.cs @@ -512,45 +512,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (InformationTypeElement != null) yield return InformationTypeElement; - if (SummaryElement != null) yield return SummaryElement; - if (Type != null) yield return Type; - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (Author != null) yield return Author; - foreach (var elem in PathElement) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (FreeToShareElement != null) yield return FreeToShareElement; - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (InformationTypeElement != null) yield return new ElementValue("informationType", InformationTypeElement); - if (SummaryElement != null) yield return new ElementValue("summary", SummaryElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in PathElement) { if (elem != null) yield return new ElementValue("path", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (FreeToShareElement != null) yield return new ElementValue("freeToShare", FreeToShareElement); - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -590,7 +552,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -630,7 +592,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (InformationTypeElement is not null) yield return new KeyValuePair("informationType",InformationTypeElement); @@ -1003,47 +965,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (CiteAs != null) yield return CiteAs; - if (DateElement != null) yield return DateElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (Artifact != null) yield return Artifact; - foreach (var elem in Content) { if (elem != null) yield return elem; } - if (WorkflowStatusElement != null) yield return WorkflowStatusElement; - if (DispositionElement != null) yield return DispositionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (CiteAs != null) yield return new ElementValue("citeAs", CiteAs); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (Artifact != null) yield return new ElementValue("artifact", Artifact); - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - if (WorkflowStatusElement != null) yield return new ElementValue("workflowStatus", WorkflowStatusElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1086,7 +1008,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1129,7 +1051,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs index 1db229fa24..6c8c4eb9c9 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/AuditEvent.cs @@ -250,29 +250,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -288,7 +266,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -304,7 +282,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -549,41 +527,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Who != null) yield return Who; - if (RequestorElement != null) yield return RequestorElement; - if (Location != null) yield return Location; - foreach (var elem in PolicyElement) { if (elem != null) yield return elem; } - if (Network != null) yield return Network; - foreach (var elem in Authorization) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Who != null) yield return new ElementValue("who", Who); - if (RequestorElement != null) yield return new ElementValue("requestor", RequestorElement); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in PolicyElement) { if (elem != null) yield return new ElementValue("policy", elem); } - if (Network != null) yield return new ElementValue("network", Network); - foreach (var elem in Authorization) { if (elem != null) yield return new ElementValue("authorization", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -617,7 +561,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -651,7 +595,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -777,31 +721,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Site != null) yield return Site; - if (Observer != null) yield return Observer; - foreach (var elem in Type) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Site != null) yield return new ElementValue("site", Site); - if (Observer != null) yield return new ElementValue("observer", Observer); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -820,7 +740,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -839,7 +759,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Site is not null) yield return new KeyValuePair("site",Site); @@ -1026,37 +946,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (What != null) yield return What; - if (Role != null) yield return Role; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - if (QueryElement != null) yield return QueryElement; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - foreach (var elem in Agent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (What != null) yield return new ElementValue("what", What); - if (Role != null) yield return new ElementValue("role", Role); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - if (QueryElement != null) yield return new ElementValue("query", QueryElement); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1084,7 +974,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1112,7 +1002,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (What is not null) yield return new KeyValuePair("what",What); @@ -1217,29 +1107,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1255,7 +1123,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1271,7 +1139,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1620,53 +1488,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (ActionElement != null) yield return ActionElement; - if (SeverityElement != null) yield return SeverityElement; - if (Occurred != null) yield return Occurred; - if (RecordedElement != null) yield return RecordedElement; - if (Outcome != null) yield return Outcome; - foreach (var elem in Authorization) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - foreach (var elem in Agent) { if (elem != null) yield return elem; } - if (Source != null) yield return Source; - foreach (var elem in Entity) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (ActionElement != null) yield return new ElementValue("action", ActionElement); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (Occurred != null) yield return new ElementValue("occurred", Occurred); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - foreach (var elem in Authorization) { if (elem != null) yield return new ElementValue("authorization", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Entity) { if (elem != null) yield return new ElementValue("entity", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1718,7 +1540,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1770,7 +1592,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category?.Any() == true) yield return new KeyValuePair("category",Category); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Availability.cs b/src/Hl7.Fhir.R5/Model/Generated/Availability.cs index 1a63e805e9..a0862bb52e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Availability.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Availability.cs @@ -247,33 +247,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return elem; } - if (AllDayElement != null) yield return AllDayElement; - if (AvailableStartTimeElement != null) yield return AvailableStartTimeElement; - if (AvailableEndTimeElement != null) yield return AvailableEndTimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return new ElementValue("daysOfWeek", elem); } - if (AllDayElement != null) yield return new ElementValue("allDay", AllDayElement); - if (AvailableStartTimeElement != null) yield return new ElementValue("availableStartTime", AvailableStartTimeElement); - if (AvailableEndTimeElement != null) yield return new ElementValue("availableEndTime", AvailableEndTimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -295,7 +269,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -317,7 +291,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DaysOfWeekElement?.Any() == true) yield return new KeyValuePair("daysOfWeek",DaysOfWeekElement); @@ -430,29 +404,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (During != null) yield return During; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (During != null) yield return new ElementValue("during", During); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -468,7 +420,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -484,7 +436,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -566,29 +518,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in AvailableTime) { if (elem != null) yield return elem; } - foreach (var elem in NotAvailableTime) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in AvailableTime) { if (elem != null) yield return new ElementValue("availableTime", elem); } - foreach (var elem in NotAvailableTime) { if (elem != null) yield return new ElementValue("notAvailableTime", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -604,7 +534,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -620,7 +550,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AvailableTime?.Any() == true) yield return new KeyValuePair("availableTime",AvailableTime); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Basic.cs b/src/Hl7.Fhir.R5/Model/Generated/Basic.cs index d35a0b9af2..e6164b7343 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Basic.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Basic.cs @@ -205,35 +205,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (CreatedElement != null) yield return CreatedElement; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -258,7 +230,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +255,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs index f2f73cfd3d..c60feb2d0a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProduct.cs @@ -167,31 +167,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Collector != null) yield return Collector; - if (Source != null) yield return Source; - if (Collected != null) yield return Collected; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Collector != null) yield return new ElementValue("collector", Collector); - if (Source != null) yield return new ElementValue("source", Source); - if (Collected != null) yield return new ElementValue("collected", Collected); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -229,7 +205,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Collector is not null) yield return new KeyValuePair("collector",Collector); @@ -331,29 +307,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -385,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -693,51 +647,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductCategory != null) yield return ProductCategory; - if (ProductCode != null) yield return ProductCode; - foreach (var elem in Parent) { if (elem != null) yield return elem; } - foreach (var elem in Request) { if (elem != null) yield return elem; } - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (BiologicalSourceEvent != null) yield return BiologicalSourceEvent; - foreach (var elem in ProcessingFacility) { if (elem != null) yield return elem; } - if (DivisionElement != null) yield return DivisionElement; - if (ProductStatus != null) yield return ProductStatus; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (Collection != null) yield return Collection; - if (StorageTempRequirements != null) yield return StorageTempRequirements; - foreach (var elem in Property) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductCategory != null) yield return new ElementValue("productCategory", ProductCategory); - if (ProductCode != null) yield return new ElementValue("productCode", ProductCode); - foreach (var elem in Parent) { if (elem != null) yield return new ElementValue("parent", elem); } - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (BiologicalSourceEvent != null) yield return new ElementValue("biologicalSourceEvent", BiologicalSourceEvent); - foreach (var elem in ProcessingFacility) { if (elem != null) yield return new ElementValue("processingFacility", elem); } - if (DivisionElement != null) yield return new ElementValue("division", DivisionElement); - if (ProductStatus != null) yield return new ElementValue("productStatus", ProductStatus); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (Collection != null) yield return new ElementValue("collection", Collection); - if (StorageTempRequirements != null) yield return new ElementValue("storageTempRequirements", StorageTempRequirements); - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -786,7 +696,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -835,7 +745,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductCategory is not null) yield return new KeyValuePair("productCategory",ProductCategory); diff --git a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs index 26070cc7df..8cb00b6ea0 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/BiologicallyDerivedProductDispense.cs @@ -205,29 +205,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -243,7 +221,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -259,7 +237,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -661,57 +639,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (OriginRelationshipType != null) yield return OriginRelationshipType; - if (Product != null) yield return Product; - if (Patient != null) yield return Patient; - if (MatchStatus != null) yield return MatchStatus; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (PreparedDateElement != null) yield return PreparedDateElement; - if (WhenHandedOverElement != null) yield return WhenHandedOverElement; - if (Destination != null) yield return Destination; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (UsageInstructionElement != null) yield return UsageInstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (OriginRelationshipType != null) yield return new ElementValue("originRelationshipType", OriginRelationshipType); - if (Product != null) yield return new ElementValue("product", Product); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (MatchStatus != null) yield return new ElementValue("matchStatus", MatchStatus); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (PreparedDateElement != null) yield return new ElementValue("preparedDate", PreparedDateElement); - if (WhenHandedOverElement != null) yield return new ElementValue("whenHandedOver", WhenHandedOverElement); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (UsageInstructionElement != null) yield return new ElementValue("usageInstruction", UsageInstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -769,7 +697,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -827,7 +755,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs b/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs index abfcaa4b76..131d19a80b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/BodyStructure.cs @@ -203,35 +203,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Structure != null) yield return Structure; - if (Laterality != null) yield return Laterality; - foreach (var elem in BodyLandmarkOrientation) { if (elem != null) yield return elem; } - foreach (var elem in SpatialReference) { if (elem != null) yield return elem; } - foreach (var elem in Qualifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Structure != null) yield return new ElementValue("structure", Structure); - if (Laterality != null) yield return new ElementValue("laterality", Laterality); - foreach (var elem in BodyLandmarkOrientation) { if (elem != null) yield return new ElementValue("bodyLandmarkOrientation", elem); } - foreach (var elem in SpatialReference) { if (elem != null) yield return new ElementValue("spatialReference", elem); } - foreach (var elem in Qualifier) { if (elem != null) yield return new ElementValue("qualifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -256,7 +228,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -281,7 +253,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Structure is not null) yield return new KeyValuePair("structure",Structure); @@ -419,33 +391,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in LandmarkDescription) { if (elem != null) yield return elem; } - foreach (var elem in ClockFacePosition) { if (elem != null) yield return elem; } - foreach (var elem in DistanceFromLandmark) { if (elem != null) yield return elem; } - foreach (var elem in SurfaceOrientation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in LandmarkDescription) { if (elem != null) yield return new ElementValue("landmarkDescription", elem); } - foreach (var elem in ClockFacePosition) { if (elem != null) yield return new ElementValue("clockFacePosition", elem); } - foreach (var elem in DistanceFromLandmark) { if (elem != null) yield return new ElementValue("distanceFromLandmark", elem); } - foreach (var elem in SurfaceOrientation) { if (elem != null) yield return new ElementValue("surfaceOrientation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -467,7 +413,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -489,7 +435,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LandmarkDescription?.Any() == true) yield return new KeyValuePair("landmarkDescription",LandmarkDescription); @@ -590,29 +536,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Device) { if (elem != null) yield return elem; } - foreach (var elem in Value) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - foreach (var elem in Value) { if (elem != null) yield return new ElementValue("value", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -628,7 +552,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -644,7 +568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Device?.Any() == true) yield return new KeyValuePair("device",Device); @@ -866,41 +790,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Morphology != null) yield return Morphology; - foreach (var elem in IncludedStructure) { if (elem != null) yield return elem; } - foreach (var elem in ExcludedStructure) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Image) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Morphology != null) yield return new ElementValue("morphology", Morphology); - foreach (var elem in IncludedStructure) { if (elem != null) yield return new ElementValue("includedStructure", elem); } - foreach (var elem in ExcludedStructure) { if (elem != null) yield return new ElementValue("excludedStructure", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Image) { if (elem != null) yield return new ElementValue("image", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -934,7 +824,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -968,7 +858,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs index 85aedb510d..0725ad9424 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CarePlan.cs @@ -207,31 +207,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in PerformedActivity) { if (elem != null) yield return elem; } - foreach (var elem in Progress) { if (elem != null) yield return elem; } - if (PlannedActivityReference != null) yield return PlannedActivityReference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in PerformedActivity) { if (elem != null) yield return new ElementValue("performedActivity", elem); } - foreach (var elem in Progress) { if (elem != null) yield return new ElementValue("progress", elem); } - if (PlannedActivityReference != null) yield return new ElementValue("plannedActivityReference", PlannedActivityReference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -250,7 +226,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -269,7 +245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PerformedActivity?.Any() == true) yield return new KeyValuePair("performedActivity",PerformedActivity); @@ -857,71 +833,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Period != null) yield return Period; - if (CreatedElement != null) yield return CreatedElement; - if (Custodian != null) yield return Custodian; - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Activity) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Period != null) yield return new ElementValue("period", Period); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Activity) { if (elem != null) yield return new ElementValue("activity", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1000,7 +912,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1079,7 +991,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs index 500b9a6100..8aefa3fe8e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CareTeam.cs @@ -225,33 +225,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Member != null) yield return Member; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (Coverage != null) yield return Coverage; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Member != null) yield return new ElementValue("member", Member); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -273,7 +247,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -295,7 +269,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -574,47 +548,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (Subject != null) yield return Subject; - if (Period != null) yield return Period; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in ManagingOrganization) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in ManagingOrganization) { if (elem != null) yield return new ElementValue("managingOrganization", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -657,7 +591,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -700,7 +634,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs index f2ccc88301..a762ff4a9b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ChargeItem.cs @@ -202,29 +202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -240,7 +218,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -256,7 +234,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -836,77 +814,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in DefinitionUriElement) { if (elem != null) yield return elem; } - foreach (var elem in DefinitionCanonicalElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (PerformingOrganization != null) yield return PerformingOrganization; - if (RequestingOrganization != null) yield return RequestingOrganization; - if (CostCenter != null) yield return CostCenter; - if (Quantity != null) yield return Quantity; - foreach (var elem in Bodysite) { if (elem != null) yield return elem; } - if (UnitPriceComponent != null) yield return UnitPriceComponent; - if (TotalPriceComponent != null) yield return TotalPriceComponent; - if (OverrideReason != null) yield return OverrideReason; - if (Enterer != null) yield return Enterer; - if (EnteredDateElement != null) yield return EnteredDateElement; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Service) { if (elem != null) yield return elem; } - foreach (var elem in Product) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in DefinitionUriElement) { if (elem != null) yield return new ElementValue("definitionUri", elem); } - foreach (var elem in DefinitionCanonicalElement) { if (elem != null) yield return new ElementValue("definitionCanonical", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (PerformingOrganization != null) yield return new ElementValue("performingOrganization", PerformingOrganization); - if (RequestingOrganization != null) yield return new ElementValue("requestingOrganization", RequestingOrganization); - if (CostCenter != null) yield return new ElementValue("costCenter", CostCenter); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Bodysite) { if (elem != null) yield return new ElementValue("bodysite", elem); } - if (UnitPriceComponent != null) yield return new ElementValue("unitPriceComponent", UnitPriceComponent); - if (TotalPriceComponent != null) yield return new ElementValue("totalPriceComponent", TotalPriceComponent); - if (OverrideReason != null) yield return new ElementValue("overrideReason", OverrideReason); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (EnteredDateElement != null) yield return new ElementValue("enteredDate", EnteredDateElement); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Service) { if (elem != null) yield return new ElementValue("service", elem); } - foreach (var elem in Product) { if (elem != null) yield return new ElementValue("product", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -994,7 +902,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1082,7 +990,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs index bb1a905071..4eb18dfdb5 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ChargeItemDefinition.cs @@ -163,31 +163,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Condition != null) yield return Condition; - if (EffectivePeriod != null) yield return EffectivePeriod; - if (RelatedArtifact != null) yield return RelatedArtifact; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Condition != null) yield return new ElementValue("condition", Condition); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - if (RelatedArtifact != null) yield return new ElementValue("relatedArtifact", RelatedArtifact); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -206,7 +182,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -225,7 +201,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Condition is not null) yield return new KeyValuePair("condition",Condition); @@ -324,29 +300,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Applicability) { if (elem != null) yield return elem; } - foreach (var elem in PriceComponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Applicability) { if (elem != null) yield return new ElementValue("applicability", elem); } - foreach (var elem in PriceComponent) { if (elem != null) yield return new ElementValue("priceComponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -362,7 +316,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -378,7 +332,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Applicability?.Any() == true) yield return new KeyValuePair("applicability",Applicability); @@ -1169,77 +1123,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return elem; } - foreach (var elem in PartOfElement) { if (elem != null) yield return elem; } - foreach (var elem in ReplacesElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (Code != null) yield return Code; - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Applicability) { if (elem != null) yield return elem; } - foreach (var elem in PropertyGroup) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return new ElementValue("derivedFromUri", elem); } - foreach (var elem in PartOfElement) { if (elem != null) yield return new ElementValue("partOf", elem); } - foreach (var elem in ReplacesElement) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Applicability) { if (elem != null) yield return new ElementValue("applicability", elem); } - foreach (var elem in PropertyGroup) { if (elem != null) yield return new ElementValue("propertyGroup", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1327,7 +1211,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1415,7 +1299,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs index 62fa855045..d026ba8cd1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Citation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Citation.cs @@ -401,29 +401,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Style != null) yield return Style; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Style != null) yield return new ElementValue("style", Style); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +417,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -455,7 +433,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Style is not null) yield return new KeyValuePair("style",Style); @@ -554,29 +532,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -592,7 +548,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -608,7 +564,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -742,31 +698,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Activity != null) yield return Activity; - if (ActualElement != null) yield return ActualElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Activity != null) yield return new ElementValue("activity", Activity); - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -785,7 +717,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -804,7 +736,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Activity is not null) yield return new KeyValuePair("activity",Activity); @@ -1136,55 +1068,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in RelatedIdentifier) { if (elem != null) yield return elem; } - if (DateAccessedElement != null) yield return DateAccessedElement; - if (Version != null) yield return Version; - foreach (var elem in CurrentState) { if (elem != null) yield return elem; } - foreach (var elem in StatusDate) { if (elem != null) yield return elem; } - foreach (var elem in Title) { if (elem != null) yield return elem; } - foreach (var elem in Abstract) { if (elem != null) yield return elem; } - if (Part != null) yield return Part; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - foreach (var elem in PublicationForm) { if (elem != null) yield return elem; } - foreach (var elem in WebLocation) { if (elem != null) yield return elem; } - foreach (var elem in Classification) { if (elem != null) yield return elem; } - if (Contributorship != null) yield return Contributorship; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in RelatedIdentifier) { if (elem != null) yield return new ElementValue("relatedIdentifier", elem); } - if (DateAccessedElement != null) yield return new ElementValue("dateAccessed", DateAccessedElement); - if (Version != null) yield return new ElementValue("version", Version); - foreach (var elem in CurrentState) { if (elem != null) yield return new ElementValue("currentState", elem); } - foreach (var elem in StatusDate) { if (elem != null) yield return new ElementValue("statusDate", elem); } - foreach (var elem in Title) { if (elem != null) yield return new ElementValue("title", elem); } - foreach (var elem in Abstract) { if (elem != null) yield return new ElementValue("abstract", elem); } - if (Part != null) yield return new ElementValue("part", Part); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - foreach (var elem in PublicationForm) { if (elem != null) yield return new ElementValue("publicationForm", elem); } - foreach (var elem in WebLocation) { if (elem != null) yield return new ElementValue("webLocation", elem); } - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - if (Contributorship != null) yield return new ElementValue("contributorship", Contributorship); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1239,7 +1123,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1294,7 +1178,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1421,29 +1305,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ValueElement != null) yield return ValueElement; - if (BaseCitation != null) yield return BaseCitation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (BaseCitation != null) yield return new ElementValue("baseCitation", BaseCitation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1459,7 +1321,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1475,7 +1337,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ValueElement is not null) yield return new KeyValuePair("value",ValueElement); @@ -1608,31 +1470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Activity != null) yield return Activity; - if (ActualElement != null) yield return ActualElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Activity != null) yield return new ElementValue("activity", Activity); - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1651,7 +1489,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1670,7 +1508,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Activity is not null) yield return new KeyValuePair("activity",Activity); @@ -1802,31 +1640,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Language != null) yield return Language; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Language != null) yield return new ElementValue("language", Language); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1845,7 +1659,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1864,7 +1678,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -2032,33 +1846,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Language != null) yield return Language; - if (TextElement != null) yield return TextElement; - if (CopyrightElement != null) yield return CopyrightElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Language != null) yield return new ElementValue("language", Language); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2080,7 +1868,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2102,7 +1890,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2234,31 +2022,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ValueElement != null) yield return ValueElement; - if (BaseCitation != null) yield return BaseCitation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (BaseCitation != null) yield return new ElementValue("baseCitation", BaseCitation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2277,7 +2041,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2296,7 +2060,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2584,41 +2348,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - if (LabelElement != null) yield return LabelElement; - if (DisplayElement != null) yield return DisplayElement; - if (CitationElement != null) yield return CitationElement; - if (Document != null) yield return Document; - if (ResourceElement != null) yield return ResourceElement; - if (ResourceReference != null) yield return ResourceReference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (CitationElement != null) yield return new ElementValue("citation", CitationElement); - if (Document != null) yield return new ElementValue("document", Document); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (ResourceReference != null) yield return new ElementValue("resourceReference", ResourceReference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2652,7 +2382,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2686,7 +2416,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -3215,55 +2945,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PublishedIn != null) yield return PublishedIn; - if (CitedMedium != null) yield return CitedMedium; - if (VolumeElement != null) yield return VolumeElement; - if (IssueElement != null) yield return IssueElement; - if (ArticleDateElement != null) yield return ArticleDateElement; - if (PublicationDateTextElement != null) yield return PublicationDateTextElement; - if (PublicationDateSeasonElement != null) yield return PublicationDateSeasonElement; - if (LastRevisionDateElement != null) yield return LastRevisionDateElement; - foreach (var elem in Language) { if (elem != null) yield return elem; } - if (AccessionNumberElement != null) yield return AccessionNumberElement; - if (PageStringElement != null) yield return PageStringElement; - if (FirstPageElement != null) yield return FirstPageElement; - if (LastPageElement != null) yield return LastPageElement; - if (PageCountElement != null) yield return PageCountElement; - if (CopyrightElement != null) yield return CopyrightElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PublishedIn != null) yield return new ElementValue("publishedIn", PublishedIn); - if (CitedMedium != null) yield return new ElementValue("citedMedium", CitedMedium); - if (VolumeElement != null) yield return new ElementValue("volume", VolumeElement); - if (IssueElement != null) yield return new ElementValue("issue", IssueElement); - if (ArticleDateElement != null) yield return new ElementValue("articleDate", ArticleDateElement); - if (PublicationDateTextElement != null) yield return new ElementValue("publicationDateText", PublicationDateTextElement); - if (PublicationDateSeasonElement != null) yield return new ElementValue("publicationDateSeason", PublicationDateSeasonElement); - if (LastRevisionDateElement != null) yield return new ElementValue("lastRevisionDate", LastRevisionDateElement); - foreach (var elem in Language) { if (elem != null) yield return new ElementValue("language", elem); } - if (AccessionNumberElement != null) yield return new ElementValue("accessionNumber", AccessionNumberElement); - if (PageStringElement != null) yield return new ElementValue("pageString", PageStringElement); - if (FirstPageElement != null) yield return new ElementValue("firstPage", FirstPageElement); - if (LastPageElement != null) yield return new ElementValue("lastPage", LastPageElement); - if (PageCountElement != null) yield return new ElementValue("pageCount", PageCountElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3318,7 +3000,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3373,7 +3055,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PublishedIn is not null) yield return new KeyValuePair("publishedIn",PublishedIn); @@ -3567,35 +3249,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (Publisher != null) yield return Publisher; - if (PublisherLocationElement != null) yield return PublisherLocationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Publisher != null) yield return new ElementValue("publisher", Publisher); - if (PublisherLocationElement != null) yield return new ElementValue("publisherLocation", PublisherLocationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3620,7 +3274,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3645,7 +3299,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -3761,29 +3415,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3799,7 +3431,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3815,7 +3447,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Classifier?.Any() == true) yield return new KeyValuePair("classifier",Classifier); @@ -3930,31 +3562,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - foreach (var elem in ArtifactAssessment) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - foreach (var elem in ArtifactAssessment) { if (elem != null) yield return new ElementValue("artifactAssessment", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3973,7 +3581,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3992,7 +3600,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -4125,31 +3733,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CompleteElement != null) yield return CompleteElement; - foreach (var elem in Entry) { if (elem != null) yield return elem; } - foreach (var elem in Summary) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CompleteElement != null) yield return new ElementValue("complete", CompleteElement); - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - foreach (var elem in Summary) { if (elem != null) yield return new ElementValue("summary", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4168,7 +3752,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4187,7 +3771,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CompleteElement is not null) yield return new KeyValuePair("complete",CompleteElement); @@ -4445,41 +4029,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Contributor != null) yield return Contributor; - if (ForenameInitialsElement != null) yield return ForenameInitialsElement; - foreach (var elem in Affiliation) { if (elem != null) yield return elem; } - foreach (var elem in ContributionType) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - foreach (var elem in ContributionInstance) { if (elem != null) yield return elem; } - if (CorrespondingContactElement != null) yield return CorrespondingContactElement; - if (RankingOrderElement != null) yield return RankingOrderElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Contributor != null) yield return new ElementValue("contributor", Contributor); - if (ForenameInitialsElement != null) yield return new ElementValue("forenameInitials", ForenameInitialsElement); - foreach (var elem in Affiliation) { if (elem != null) yield return new ElementValue("affiliation", elem); } - foreach (var elem in ContributionType) { if (elem != null) yield return new ElementValue("contributionType", elem); } - if (Role != null) yield return new ElementValue("role", Role); - foreach (var elem in ContributionInstance) { if (elem != null) yield return new ElementValue("contributionInstance", elem); } - if (CorrespondingContactElement != null) yield return new ElementValue("correspondingContact", CorrespondingContactElement); - if (RankingOrderElement != null) yield return new ElementValue("rankingOrder", RankingOrderElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4513,7 +4063,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4547,7 +4097,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Contributor is not null) yield return new KeyValuePair("contributor",Contributor); @@ -4666,29 +4216,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (TimeElement != null) yield return TimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4704,7 +4232,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4720,7 +4248,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -4867,33 +4395,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Style != null) yield return Style; - if (Source != null) yield return Source; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Style != null) yield return new ElementValue("style", Style); - if (Source != null) yield return new ElementValue("source", Source); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4915,7 +4417,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4937,7 +4439,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -5758,87 +5260,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in Summary) { if (elem != null) yield return elem; } - foreach (var elem in Classification) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in CurrentState) { if (elem != null) yield return elem; } - foreach (var elem in StatusDate) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (CitedArtifact != null) yield return CitedArtifact; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in Summary) { if (elem != null) yield return new ElementValue("summary", elem); } - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in CurrentState) { if (elem != null) yield return new ElementValue("currentState", elem); } - foreach (var elem in StatusDate) { if (elem != null) yield return new ElementValue("statusDate", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (CitedArtifact != null) yield return new ElementValue("citedArtifact", CitedArtifact); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5941,7 +5363,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6044,7 +5466,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Claim.cs b/src/Hl7.Fhir.R5/Model/Generated/Claim.cs index bdcd0162b2..b0ac67963d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Claim.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Claim.cs @@ -167,31 +167,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Claim != null) yield return Claim; - if (Relationship != null) yield return Relationship; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Claim != null) yield return new ElementValue("claim", Claim); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -229,7 +205,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Claim is not null) yield return new KeyValuePair("claim",Claim); @@ -331,29 +307,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -385,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -486,29 +440,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (When != null) yield return When; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (When != null) yield return new ElementValue("when", When); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -524,7 +456,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -540,7 +472,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -726,35 +658,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Provider != null) yield return Provider; - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Role != null) yield return Role; - if (Specialty != null) yield return Specialty; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Role != null) yield return new ElementValue("role", Role); - if (Specialty != null) yield return new ElementValue("specialty", Specialty); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -779,7 +683,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -804,7 +708,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -996,37 +900,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Timing != null) yield return Timing; - if (Value != null) yield return Value; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Value != null) yield return new ElementValue("value", Value); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1054,7 +928,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1082,7 +956,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1241,33 +1115,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Diagnosis != null) yield return Diagnosis; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (OnAdmission != null) yield return OnAdmission; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (OnAdmission != null) yield return new ElementValue("onAdmission", OnAdmission); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1289,7 +1137,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1311,7 +1159,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1504,35 +1352,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (Procedure != null) yield return Procedure; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1557,7 +1377,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1582,7 +1402,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1842,39 +1662,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (FocalElement != null) yield return FocalElement; - if (Identifier != null) yield return Identifier; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - if (ClaimResponse != null) yield return ClaimResponse; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1905,7 +1693,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1936,7 +1724,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -2076,31 +1864,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Type != null) yield return Type; - if (Location != null) yield return Location; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Location != null) yield return new ElementValue("location", Location); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2119,7 +1883,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2138,7 +1902,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -2742,75 +2506,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Request) { if (elem != null) yield return elem; } - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (PatientPaid != null) yield return PatientPaid; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return new ElementValue("careTeamSequence", elem); } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return new ElementValue("diagnosisSequence", elem); } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return new ElementValue("procedureSequence", elem); } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return new ElementValue("informationSequence", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2895,7 +2591,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2980,7 +2676,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3103,29 +2799,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Site) { if (elem != null) yield return elem; } - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3141,7 +2815,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3157,7 +2831,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Site?.Any() == true) yield return new KeyValuePair("site",Site); @@ -3527,57 +3201,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (PatientPaid != null) yield return PatientPaid; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3635,7 +3259,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3693,7 +3317,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4060,55 +3684,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (PatientPaid != null) yield return PatientPaid; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4163,7 +3739,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4218,7 +3794,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4890,89 +4466,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (BillablePeriod != null) yield return BillablePeriod; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Priority != null) yield return Priority; - if (FundsReserve != null) yield return FundsReserve; - foreach (var elem in Related) { if (elem != null) yield return elem; } - if (Prescription != null) yield return Prescription; - if (OriginalPrescription != null) yield return OriginalPrescription; - if (Payee != null) yield return Payee; - if (Referral != null) yield return Referral; - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - if (Facility != null) yield return Facility; - if (DiagnosisRelatedGroup != null) yield return DiagnosisRelatedGroup; - foreach (var elem in Event) { if (elem != null) yield return elem; } - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (Accident != null) yield return Accident; - if (PatientPaid != null) yield return PatientPaid; - foreach (var elem in Item) { if (elem != null) yield return elem; } - if (Total != null) yield return Total; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (BillablePeriod != null) yield return new ElementValue("billablePeriod", BillablePeriod); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - if (Prescription != null) yield return new ElementValue("prescription", Prescription); - if (OriginalPrescription != null) yield return new ElementValue("originalPrescription", OriginalPrescription); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Referral != null) yield return new ElementValue("referral", Referral); - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - if (Facility != null) yield return new ElementValue("facility", Facility); - if (DiagnosisRelatedGroup != null) yield return new ElementValue("diagnosisRelatedGroup", DiagnosisRelatedGroup); - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (Accident != null) yield return new ElementValue("accident", Accident); - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - if (Total != null) yield return new ElementValue("total", Total); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5078,7 +4572,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5184,7 +4678,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs index c9f0693ff0..8040203a0d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ClaimResponse.cs @@ -151,29 +151,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (When != null) yield return When; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (When != null) yield return new ElementValue("when", When); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -189,7 +167,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -205,7 +183,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -406,37 +384,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ItemSequenceElement != null) yield return ItemSequenceElement; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ItemSequenceElement != null) yield return new ElementValue("itemSequence", ItemSequenceElement); - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -464,7 +412,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -492,7 +440,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement is not null) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -645,33 +593,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Decision != null) yield return Decision; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (PreAuthRefElement != null) yield return PreAuthRefElement; - if (PreAuthPeriod != null) yield return PreAuthPeriod; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Decision != null) yield return new ElementValue("decision", Decision); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (PreAuthRefElement != null) yield return new ElementValue("preAuthRef", PreAuthRefElement); - if (PreAuthPeriod != null) yield return new ElementValue("preAuthPeriod", PreAuthPeriod); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -693,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -715,7 +637,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Decision is not null) yield return new KeyValuePair("decision",Decision); @@ -848,33 +770,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Reason != null) yield return Reason; - if (Amount != null) yield return Amount; - if (Quantity != null) yield return Quantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -896,7 +792,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -918,7 +814,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -1121,37 +1017,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DetailSequenceElement != null) yield return DetailSequenceElement; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DetailSequenceElement != null) yield return new ElementValue("detailSequence", DetailSequenceElement); - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1179,7 +1045,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1207,7 +1073,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DetailSequenceElement is not null) yield return new KeyValuePair("detailSequence",DetailSequenceElement); @@ -1395,35 +1261,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SubDetailSequenceElement != null) yield return SubDetailSequenceElement; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SubDetailSequenceElement != null) yield return new ElementValue("subDetailSequence", SubDetailSequenceElement); - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1448,7 +1286,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1473,7 +1311,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SubDetailSequenceElement is not null) yield return new KeyValuePair("subDetailSequence",SubDetailSequenceElement); @@ -2025,71 +1863,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in SubdetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - foreach (var elem in Provider) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Request) { if (elem != null) yield return elem; } - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return new ElementValue("itemSequence", elem); } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return new ElementValue("detailSequence", elem); } - foreach (var elem in SubdetailSequenceElement) { if (elem != null) yield return new ElementValue("subdetailSequence", elem); } - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - foreach (var elem in Provider) { if (elem != null) yield return new ElementValue("provider", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2168,7 +1942,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2247,7 +2021,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement?.Any() == true) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -2368,29 +2142,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Site) { if (elem != null) yield return elem; } - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2406,7 +2158,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2422,7 +2174,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Site?.Any() == true) yield return new KeyValuePair("site",Site); @@ -2755,53 +2507,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2853,7 +2559,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2905,7 +2611,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TraceNumber?.Any() == true) yield return new KeyValuePair("traceNumber",TraceNumber); @@ -3233,51 +2939,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3326,7 +2988,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3375,7 +3037,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TraceNumber?.Any() == true) yield return new KeyValuePair("traceNumber",TraceNumber); @@ -3486,29 +3148,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3524,7 +3164,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3540,7 +3180,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -3722,37 +3362,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Adjustment != null) yield return Adjustment; - if (AdjustmentReason != null) yield return AdjustmentReason; - if (DateElement != null) yield return DateElement; - if (Amount != null) yield return Amount; - if (Identifier != null) yield return Identifier; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Adjustment != null) yield return new ElementValue("adjustment", Adjustment); - if (AdjustmentReason != null) yield return new ElementValue("adjustmentReason", AdjustmentReason); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3780,7 +3390,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3808,7 +3418,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -3979,33 +3589,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (Type != null) yield return Type; - if (TextElement != null) yield return TextElement; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (Type != null) yield return new ElementValue("type", Type); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4027,7 +3611,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4049,7 +3633,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -4257,35 +3841,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - if (ClaimResponse != null) yield return ClaimResponse; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4310,7 +3866,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4335,7 +3891,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4558,35 +4114,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ItemSequenceElement != null) yield return ItemSequenceElement; - if (DetailSequenceElement != null) yield return DetailSequenceElement; - if (SubDetailSequenceElement != null) yield return SubDetailSequenceElement; - if (Code != null) yield return Code; - foreach (var elem in ExpressionElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ItemSequenceElement != null) yield return new ElementValue("itemSequence", ItemSequenceElement); - if (DetailSequenceElement != null) yield return new ElementValue("detailSequence", DetailSequenceElement); - if (SubDetailSequenceElement != null) yield return new ElementValue("subDetailSequence", SubDetailSequenceElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in ExpressionElement) { if (elem != null) yield return new ElementValue("expression", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4611,7 +4139,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4636,7 +4164,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement is not null) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -5352,89 +4880,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (CreatedElement != null) yield return CreatedElement; - if (Insurer != null) yield return Insurer; - if (Requestor != null) yield return Requestor; - if (Request != null) yield return Request; - if (OutcomeElement != null) yield return OutcomeElement; - if (Decision != null) yield return Decision; - if (DispositionElement != null) yield return DispositionElement; - if (PreAuthRefElement != null) yield return PreAuthRefElement; - if (PreAuthPeriod != null) yield return PreAuthPeriod; - foreach (var elem in Event) { if (elem != null) yield return elem; } - if (PayeeType != null) yield return PayeeType; - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - if (DiagnosisRelatedGroup != null) yield return DiagnosisRelatedGroup; - foreach (var elem in Item) { if (elem != null) yield return elem; } - foreach (var elem in AddItem) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Total) { if (elem != null) yield return elem; } - if (Payment != null) yield return Payment; - if (FundsReserve != null) yield return FundsReserve; - if (FormCode != null) yield return FormCode; - if (Form != null) yield return Form; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Error) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Requestor != null) yield return new ElementValue("requestor", Requestor); - if (Request != null) yield return new ElementValue("request", Request); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (Decision != null) yield return new ElementValue("decision", Decision); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (PreAuthRefElement != null) yield return new ElementValue("preAuthRef", PreAuthRefElement); - if (PreAuthPeriod != null) yield return new ElementValue("preAuthPeriod", PreAuthPeriod); - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - if (PayeeType != null) yield return new ElementValue("payeeType", PayeeType); - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - if (DiagnosisRelatedGroup != null) yield return new ElementValue("diagnosisRelatedGroup", DiagnosisRelatedGroup); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - foreach (var elem in AddItem) { if (elem != null) yield return new ElementValue("addItem", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Total) { if (elem != null) yield return new ElementValue("total", elem); } - if (Payment != null) yield return new ElementValue("payment", Payment); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - if (FormCode != null) yield return new ElementValue("formCode", FormCode); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return new ElementValue("communicationRequest", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5540,7 +4986,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5646,7 +5092,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs index 73815fdf04..ac7dec981d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ClinicalImpression.cs @@ -165,29 +165,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (BasisElement != null) yield return BasisElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (BasisElement != null) yield return new ElementValue("basis", BasisElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -203,7 +181,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -219,7 +197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -694,63 +672,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (DescriptionElement != null) yield return DescriptionElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (DateElement != null) yield return DateElement; - if (Performer != null) yield return Performer; - if (Previous != null) yield return Previous; - foreach (var elem in Problem) { if (elem != null) yield return elem; } - if (ChangePattern != null) yield return ChangePattern; - foreach (var elem in ProtocolElement) { if (elem != null) yield return elem; } - if (SummaryElement != null) yield return SummaryElement; - foreach (var elem in Finding) { if (elem != null) yield return elem; } - foreach (var elem in PrognosisCodeableConcept) { if (elem != null) yield return elem; } - foreach (var elem in PrognosisReference) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Performer != null) yield return new ElementValue("performer", Performer); - if (Previous != null) yield return new ElementValue("previous", Previous); - foreach (var elem in Problem) { if (elem != null) yield return new ElementValue("problem", elem); } - if (ChangePattern != null) yield return new ElementValue("changePattern", ChangePattern); - foreach (var elem in ProtocolElement) { if (elem != null) yield return new ElementValue("protocol", elem); } - if (SummaryElement != null) yield return new ElementValue("summary", SummaryElement); - foreach (var elem in Finding) { if (elem != null) yield return new ElementValue("finding", elem); } - foreach (var elem in PrognosisCodeableConcept) { if (elem != null) yield return new ElementValue("prognosisCodeableConcept", elem); } - foreach (var elem in PrognosisReference) { if (elem != null) yield return new ElementValue("prognosisReference", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -817,7 +739,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -884,7 +806,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs index 28201c8681..5bdb8f822e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ClinicalUseDefinition.cs @@ -252,37 +252,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DiseaseSymptomProcedure != null) yield return DiseaseSymptomProcedure; - if (DiseaseStatus != null) yield return DiseaseStatus; - foreach (var elem in Comorbidity) { if (elem != null) yield return elem; } - foreach (var elem in Indication) { if (elem != null) yield return elem; } - if (Applicability != null) yield return Applicability; - foreach (var elem in OtherTherapy) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DiseaseSymptomProcedure != null) yield return new ElementValue("diseaseSymptomProcedure", DiseaseSymptomProcedure); - if (DiseaseStatus != null) yield return new ElementValue("diseaseStatus", DiseaseStatus); - foreach (var elem in Comorbidity) { if (elem != null) yield return new ElementValue("comorbidity", elem); } - foreach (var elem in Indication) { if (elem != null) yield return new ElementValue("indication", elem); } - if (Applicability != null) yield return new ElementValue("applicability", Applicability); - foreach (var elem in OtherTherapy) { if (elem != null) yield return new ElementValue("otherTherapy", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -310,7 +280,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -338,7 +308,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DiseaseSymptomProcedure is not null) yield return new KeyValuePair("diseaseSymptomProcedure",DiseaseSymptomProcedure); @@ -442,29 +412,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RelationshipType != null) yield return RelationshipType; - if (Treatment != null) yield return Treatment; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RelationshipType != null) yield return new ElementValue("relationshipType", RelationshipType); - if (Treatment != null) yield return new ElementValue("treatment", Treatment); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -480,7 +428,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -496,7 +444,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RelationshipType is not null) yield return new KeyValuePair("relationshipType",RelationshipType); @@ -696,41 +644,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DiseaseSymptomProcedure != null) yield return DiseaseSymptomProcedure; - if (DiseaseStatus != null) yield return DiseaseStatus; - foreach (var elem in Comorbidity) { if (elem != null) yield return elem; } - if (IntendedEffect != null) yield return IntendedEffect; - if (Duration != null) yield return Duration; - foreach (var elem in UndesirableEffect) { if (elem != null) yield return elem; } - if (Applicability != null) yield return Applicability; - foreach (var elem in OtherTherapy) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DiseaseSymptomProcedure != null) yield return new ElementValue("diseaseSymptomProcedure", DiseaseSymptomProcedure); - if (DiseaseStatus != null) yield return new ElementValue("diseaseStatus", DiseaseStatus); - foreach (var elem in Comorbidity) { if (elem != null) yield return new ElementValue("comorbidity", elem); } - if (IntendedEffect != null) yield return new ElementValue("intendedEffect", IntendedEffect); - if (Duration != null) yield return new ElementValue("duration", Duration); - foreach (var elem in UndesirableEffect) { if (elem != null) yield return new ElementValue("undesirableEffect", elem); } - if (Applicability != null) yield return new ElementValue("applicability", Applicability); - foreach (var elem in OtherTherapy) { if (elem != null) yield return new ElementValue("otherTherapy", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -764,7 +678,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -798,7 +712,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DiseaseSymptomProcedure is not null) yield return new KeyValuePair("diseaseSymptomProcedure",DiseaseSymptomProcedure); @@ -951,35 +865,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Interactant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Effect != null) yield return Effect; - if (Incidence != null) yield return Incidence; - foreach (var elem in Management) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Interactant) { if (elem != null) yield return new ElementValue("interactant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Effect != null) yield return new ElementValue("effect", Effect); - if (Incidence != null) yield return new ElementValue("incidence", Incidence); - foreach (var elem in Management) { if (elem != null) yield return new ElementValue("management", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1004,7 +890,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1029,7 +915,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Interactant?.Any() == true) yield return new KeyValuePair("interactant",Interactant); @@ -1117,27 +1003,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1150,7 +1016,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1163,7 +1029,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -1277,31 +1143,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SymptomConditionEffect != null) yield return SymptomConditionEffect; - if (Classification != null) yield return Classification; - if (FrequencyOfOccurrence != null) yield return FrequencyOfOccurrence; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SymptomConditionEffect != null) yield return new ElementValue("symptomConditionEffect", SymptomConditionEffect); - if (Classification != null) yield return new ElementValue("classification", Classification); - if (FrequencyOfOccurrence != null) yield return new ElementValue("frequencyOfOccurrence", FrequencyOfOccurrence); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1320,7 +1162,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1339,7 +1181,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SymptomConditionEffect is not null) yield return new KeyValuePair("symptomConditionEffect",SymptomConditionEffect); @@ -1455,29 +1297,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1493,7 +1313,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1509,7 +1329,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1801,49 +1621,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (Contraindication != null) yield return Contraindication; - if (Indication != null) yield return Indication; - if (Interaction != null) yield return Interaction; - foreach (var elem in Population) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (UndesirableEffect != null) yield return UndesirableEffect; - if (Warning != null) yield return Warning; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (Contraindication != null) yield return new ElementValue("contraindication", Contraindication); - if (Indication != null) yield return new ElementValue("indication", Indication); - if (Interaction != null) yield return new ElementValue("interaction", Interaction); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (UndesirableEffect != null) yield return new ElementValue("undesirableEffect", UndesirableEffect); - if (Warning != null) yield return new ElementValue("warning", Warning); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1889,7 +1667,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1935,7 +1713,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Communication.cs b/src/Hl7.Fhir.R5/Model/Generated/Communication.cs index 91fa2c3d1b..60a6f57d9c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Communication.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Communication.cs @@ -134,27 +134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -167,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -180,7 +160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -728,69 +708,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - foreach (var elem in InResponseTo) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in Medium) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Topic != null) yield return Topic; - foreach (var elem in About) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - if (SentElement != null) yield return SentElement; - if (ReceivedElement != null) yield return ReceivedElement; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - if (Sender != null) yield return Sender; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Payload) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - foreach (var elem in InResponseTo) { if (elem != null) yield return new ElementValue("inResponseTo", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in Medium) { if (elem != null) yield return new ElementValue("medium", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Topic != null) yield return new ElementValue("topic", Topic); - foreach (var elem in About) { if (elem != null) yield return new ElementValue("about", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (SentElement != null) yield return new ElementValue("sent", SentElement); - if (ReceivedElement != null) yield return new ElementValue("received", ReceivedElement); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - if (Sender != null) yield return new ElementValue("sender", Sender); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Payload) { if (elem != null) yield return new ElementValue("payload", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -866,7 +784,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -942,7 +860,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs index cb39bb9a66..3dcc952806 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CommunicationRequest.cs @@ -134,27 +134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -167,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -180,7 +160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -712,69 +692,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - foreach (var elem in Medium) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in About) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - foreach (var elem in Payload) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - foreach (var elem in InformationProvider) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - foreach (var elem in Medium) { if (elem != null) yield return new ElementValue("medium", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in About) { if (elem != null) yield return new ElementValue("about", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in Payload) { if (elem != null) yield return new ElementValue("payload", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - foreach (var elem in InformationProvider) { if (elem != null) yield return new ElementValue("informationProvider", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -850,7 +768,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -926,7 +844,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs index c2787ca659..c7968d7eec 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CompartmentDefinition.cs @@ -289,35 +289,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in ParamElement) { if (elem != null) yield return elem; } - if (DocumentationElement != null) yield return DocumentationElement; - if (StartParamElement != null) yield return StartParamElement; - if (EndParamElement != null) yield return EndParamElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in ParamElement) { if (elem != null) yield return new ElementValue("param", elem); } - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (StartParamElement != null) yield return new ElementValue("startParam", StartParamElement); - if (EndParamElement != null) yield return new ElementValue("endParam", EndParamElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -342,7 +314,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -367,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -904,57 +876,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CodeElement != null) yield return CodeElement; - if (SearchElement != null) yield return SearchElement; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (SearchElement != null) yield return new ElementValue("search", SearchElement); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1012,7 +934,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1070,7 +992,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Composition.cs b/src/Hl7.Fhir.R5/Model/Generated/Composition.cs index 72bd990dc3..45b409697a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Composition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Composition.cs @@ -186,31 +186,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Mode != null) yield return Mode; - if (TimeElement != null) yield return TimeElement; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Mode != null) yield return new ElementValue("mode", Mode); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -229,7 +205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -248,7 +224,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Mode is not null) yield return new KeyValuePair("mode",Mode); @@ -348,29 +324,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Period != null) yield return Period; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -386,7 +340,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -402,7 +356,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Period is not null) yield return new KeyValuePair("period",Period); @@ -640,43 +594,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Code != null) yield return Code; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Focus != null) yield return Focus; - if (Text != null) yield return Text; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in Entry) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Focus != null) yield return new ElementValue("focus", Focus); - if (Text != null) yield return new ElementValue("text", Text); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -713,7 +631,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -750,7 +668,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1245,63 +1163,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Attester) { if (elem != null) yield return elem; } - if (Custodian != null) yield return Custodian; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - foreach (var elem in Event) { if (elem != null) yield return elem; } - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Attester) { if (elem != null) yield return new ElementValue("attester", elem); } - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1368,7 +1230,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1435,7 +1297,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs index dcd1841456..902d5b5ab1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ConceptMap.cs @@ -449,35 +449,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (UriElement != null) yield return UriElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TypeElement != null) yield return TypeElement; - if (SystemElement != null) yield return SystemElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -502,7 +474,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -527,7 +499,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -735,33 +707,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (UriElement != null) yield return UriElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -783,7 +729,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -805,7 +751,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -972,33 +918,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceElement != null) yield return SourceElement; - if (TargetElement != null) yield return TargetElement; - foreach (var elem in Element) { if (elem != null) yield return elem; } - if (Unmapped != null) yield return Unmapped; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (TargetElement != null) yield return new ElementValue("target", TargetElement); - foreach (var elem in Element) { if (elem != null) yield return new ElementValue("element", elem); } - if (Unmapped != null) yield return new ElementValue("unmapped", Unmapped); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1020,7 +940,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1042,7 +962,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceElement is not null) yield return new KeyValuePair("source",SourceElement); @@ -1262,35 +1182,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (ValueSetElement != null) yield return ValueSetElement; - if (NoMapElement != null) yield return NoMapElement; - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - if (NoMapElement != null) yield return new ElementValue("noMap", NoMapElement); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1315,7 +1207,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1340,7 +1232,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1632,41 +1524,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (ValueSetElement != null) yield return ValueSetElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (CommentElement != null) yield return CommentElement; - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in DependsOn) { if (elem != null) yield return elem; } - foreach (var elem in Product) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in DependsOn) { if (elem != null) yield return new ElementValue("dependsOn", elem); } - foreach (var elem in Product) { if (elem != null) yield return new ElementValue("product", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1700,7 +1558,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1734,7 +1592,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1858,29 +1716,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1896,7 +1732,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1912,7 +1748,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -2063,31 +1899,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AttributeElement != null) yield return AttributeElement; - if (Value != null) yield return Value; - if (ValueSetElement != null) yield return ValueSetElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AttributeElement != null) yield return new ElementValue("attribute", AttributeElement); - if (Value != null) yield return new ElementValue("value", Value); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2106,7 +1918,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2125,7 +1937,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AttributeElement is not null) yield return new KeyValuePair("attribute",AttributeElement); @@ -2400,37 +2212,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (ValueSetElement != null) yield return ValueSetElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (OtherMapElement != null) yield return OtherMapElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (OtherMapElement != null) yield return new ElementValue("otherMap", OtherMapElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2458,7 +2240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2486,7 +2268,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -3312,87 +3094,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in AdditionalAttribute) { if (elem != null) yield return elem; } - if (SourceScope != null) yield return SourceScope; - if (TargetScope != null) yield return TargetScope; - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in AdditionalAttribute) { if (elem != null) yield return new ElementValue("additionalAttribute", elem); } - if (SourceScope != null) yield return new ElementValue("sourceScope", SourceScope); - if (TargetScope != null) yield return new ElementValue("targetScope", TargetScope); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3495,7 +3197,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3598,7 +3300,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Condition.cs b/src/Hl7.Fhir.R5/Model/Generated/Condition.cs index 209528f3fd..8634bf9270 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Condition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Condition.cs @@ -248,29 +248,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -286,7 +264,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -302,7 +280,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -419,31 +397,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Summary != null) yield return Summary; - foreach (var elem in Assessment) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Summary != null) yield return new ElementValue("summary", Summary); - foreach (var elem in Assessment) { if (elem != null) yield return new ElementValue("assessment", elem); } - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -462,7 +416,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -481,7 +435,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Summary is not null) yield return new KeyValuePair("summary",Summary); @@ -830,57 +784,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ClinicalStatus != null) yield return ClinicalStatus; - if (VerificationStatus != null) yield return VerificationStatus; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Severity != null) yield return Severity; - if (Code != null) yield return Code; - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Onset != null) yield return Onset; - if (Abatement != null) yield return Abatement; - if (RecordedDateElement != null) yield return RecordedDateElement; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in Stage) { if (elem != null) yield return elem; } - foreach (var elem in Evidence) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ClinicalStatus != null) yield return new ElementValue("clinicalStatus", ClinicalStatus); - if (VerificationStatus != null) yield return new ElementValue("verificationStatus", VerificationStatus); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Severity != null) yield return new ElementValue("severity", Severity); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Onset != null) yield return new ElementValue("onset", Onset); - if (Abatement != null) yield return new ElementValue("abatement", Abatement); - if (RecordedDateElement != null) yield return new ElementValue("recordedDate", RecordedDateElement); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in Stage) { if (elem != null) yield return new ElementValue("stage", elem); } - foreach (var elem in Evidence) { if (elem != null) yield return new ElementValue("evidence", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -938,7 +842,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -996,7 +900,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs index c543b5d591..60c258c58a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ConditionDefinition.cs @@ -195,29 +195,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -233,7 +211,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -249,7 +227,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -344,29 +322,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -382,7 +338,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -398,7 +354,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -535,31 +491,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -578,7 +510,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -597,7 +529,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -715,29 +647,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PurposeElement != null) yield return PurposeElement; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -753,7 +663,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -769,7 +679,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PurposeElement is not null) yield return new KeyValuePair("purpose",PurposeElement); @@ -865,29 +775,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -903,7 +791,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -919,7 +807,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -1709,83 +1597,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Severity != null) yield return Severity; - if (BodySite != null) yield return BodySite; - if (Stage != null) yield return Stage; - if (HasSeverityElement != null) yield return HasSeverityElement; - if (HasBodySiteElement != null) yield return HasBodySiteElement; - if (HasStageElement != null) yield return HasStageElement; - foreach (var elem in DefinitionElement) { if (elem != null) yield return elem; } - foreach (var elem in Observation) { if (elem != null) yield return elem; } - foreach (var elem in Medication) { if (elem != null) yield return elem; } - foreach (var elem in Precondition) { if (elem != null) yield return elem; } - foreach (var elem in Team) { if (elem != null) yield return elem; } - foreach (var elem in Questionnaire) { if (elem != null) yield return elem; } - foreach (var elem in Plan) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Severity != null) yield return new ElementValue("severity", Severity); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Stage != null) yield return new ElementValue("stage", Stage); - if (HasSeverityElement != null) yield return new ElementValue("hasSeverity", HasSeverityElement); - if (HasBodySiteElement != null) yield return new ElementValue("hasBodySite", HasBodySiteElement); - if (HasStageElement != null) yield return new ElementValue("hasStage", HasStageElement); - foreach (var elem in DefinitionElement) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in Observation) { if (elem != null) yield return new ElementValue("observation", elem); } - foreach (var elem in Medication) { if (elem != null) yield return new ElementValue("medication", elem); } - foreach (var elem in Precondition) { if (elem != null) yield return new ElementValue("precondition", elem); } - foreach (var elem in Team) { if (elem != null) yield return new ElementValue("team", elem); } - foreach (var elem in Questionnaire) { if (elem != null) yield return new ElementValue("questionnaire", elem); } - foreach (var elem in Plan) { if (elem != null) yield return new ElementValue("plan", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1882,7 +1694,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1979,7 +1791,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Consent.cs b/src/Hl7.Fhir.R5/Model/Generated/Consent.cs index daa29d66d0..175327105a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Consent.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Consent.cs @@ -213,29 +213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -251,7 +229,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -267,7 +245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -454,35 +432,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VerifiedElement != null) yield return VerifiedElement; - if (VerificationType != null) yield return VerificationType; - if (VerifiedBy != null) yield return VerifiedBy; - if (VerifiedWith != null) yield return VerifiedWith; - foreach (var elem in VerificationDateElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VerifiedElement != null) yield return new ElementValue("verified", VerifiedElement); - if (VerificationType != null) yield return new ElementValue("verificationType", VerificationType); - if (VerifiedBy != null) yield return new ElementValue("verifiedBy", VerifiedBy); - if (VerifiedWith != null) yield return new ElementValue("verifiedWith", VerifiedWith); - foreach (var elem in VerificationDateElement) { if (elem != null) yield return new ElementValue("verificationDate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -507,7 +457,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -532,7 +482,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VerifiedElement is not null) yield return new KeyValuePair("verified",VerifiedElement); @@ -806,49 +756,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Period != null) yield return Period; - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Purpose) { if (elem != null) yield return elem; } - foreach (var elem in DocumentType) { if (elem != null) yield return elem; } - foreach (var elem in ResourceType) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (DataPeriod != null) yield return DataPeriod; - foreach (var elem in Data) { if (elem != null) yield return elem; } - if (Expression != null) yield return Expression; - foreach (var elem in Provision) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Purpose) { if (elem != null) yield return new ElementValue("purpose", elem); } - foreach (var elem in DocumentType) { if (elem != null) yield return new ElementValue("documentType", elem); } - foreach (var elem in ResourceType) { if (elem != null) yield return new ElementValue("resourceType", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (DataPeriod != null) yield return new ElementValue("dataPeriod", DataPeriod); - foreach (var elem in Data) { if (elem != null) yield return new ElementValue("data", elem); } - if (Expression != null) yield return new ElementValue("expression", Expression); - foreach (var elem in Provision) { if (elem != null) yield return new ElementValue("provision", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -894,7 +802,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -940,7 +848,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Period is not null) yield return new KeyValuePair("period",Period); @@ -1049,29 +957,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1087,7 +973,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1103,7 +989,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -1223,29 +1109,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MeaningElement != null) yield return MeaningElement; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MeaningElement != null) yield return new ElementValue("meaning", MeaningElement); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1261,7 +1125,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1277,7 +1141,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MeaningElement is not null) yield return new KeyValuePair("meaning",MeaningElement); @@ -1702,61 +1566,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (Period != null) yield return Period; - foreach (var elem in Grantor) { if (elem != null) yield return elem; } - foreach (var elem in Grantee) { if (elem != null) yield return elem; } - foreach (var elem in Manager) { if (elem != null) yield return elem; } - foreach (var elem in Controller) { if (elem != null) yield return elem; } - foreach (var elem in SourceAttachment) { if (elem != null) yield return elem; } - foreach (var elem in SourceReference) { if (elem != null) yield return elem; } - foreach (var elem in RegulatoryBasis) { if (elem != null) yield return elem; } - if (PolicyBasis != null) yield return PolicyBasis; - foreach (var elem in PolicyText) { if (elem != null) yield return elem; } - foreach (var elem in Verification) { if (elem != null) yield return elem; } - if (DecisionElement != null) yield return DecisionElement; - foreach (var elem in Provision) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Grantor) { if (elem != null) yield return new ElementValue("grantor", elem); } - foreach (var elem in Grantee) { if (elem != null) yield return new ElementValue("grantee", elem); } - foreach (var elem in Manager) { if (elem != null) yield return new ElementValue("manager", elem); } - foreach (var elem in Controller) { if (elem != null) yield return new ElementValue("controller", elem); } - foreach (var elem in SourceAttachment) { if (elem != null) yield return new ElementValue("sourceAttachment", elem); } - foreach (var elem in SourceReference) { if (elem != null) yield return new ElementValue("sourceReference", elem); } - foreach (var elem in RegulatoryBasis) { if (elem != null) yield return new ElementValue("regulatoryBasis", elem); } - if (PolicyBasis != null) yield return new ElementValue("policyBasis", PolicyBasis); - foreach (var elem in PolicyText) { if (elem != null) yield return new ElementValue("policyText", elem); } - foreach (var elem in Verification) { if (elem != null) yield return new ElementValue("verification", elem); } - if (DecisionElement != null) yield return new ElementValue("decision", DecisionElement); - foreach (var elem in Provision) { if (elem != null) yield return new ElementValue("provision", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1820,7 +1630,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1884,7 +1694,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Contract.cs b/src/Hl7.Fhir.R5/Model/Generated/Contract.cs index 7e96670667..1e140e0095 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Contract.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Contract.cs @@ -472,37 +472,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (Publisher != null) yield return Publisher; - if (PublicationDateElement != null) yield return PublicationDateElement; - if (PublicationStatusElement != null) yield return PublicationStatusElement; - if (CopyrightElement != null) yield return CopyrightElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (Publisher != null) yield return new ElementValue("publisher", Publisher); - if (PublicationDateElement != null) yield return new ElementValue("publicationDate", PublicationDateElement); - if (PublicationStatusElement != null) yield return new ElementValue("publicationStatus", PublicationStatusElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -530,7 +500,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -558,7 +528,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -864,49 +834,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (IssuedElement != null) yield return IssuedElement; - if (Applies != null) yield return Applies; - if (Topic != null) yield return Topic; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (TextElement != null) yield return TextElement; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - if (Offer != null) yield return Offer; - foreach (var elem in Asset) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Applies != null) yield return new ElementValue("applies", Applies); - if (Topic != null) yield return new ElementValue("topic", Topic); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - if (Offer != null) yield return new ElementValue("offer", Offer); - foreach (var elem in Asset) { if (elem != null) yield return new ElementValue("asset", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -952,7 +880,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -998,7 +926,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1163,33 +1091,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in NumberElement) { if (elem != null) yield return elem; } - if (Classification != null) yield return Classification; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Control) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in NumberElement) { if (elem != null) yield return new ElementValue("number", elem); } - if (Classification != null) yield return new ElementValue("classification", Classification); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Control) { if (elem != null) yield return new ElementValue("control", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1211,7 +1113,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1233,7 +1135,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement?.Any() == true) yield return new KeyValuePair("number",NumberElement); @@ -1524,45 +1426,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Party) { if (elem != null) yield return elem; } - if (Topic != null) yield return Topic; - if (Type != null) yield return Type; - if (Decision != null) yield return Decision; - foreach (var elem in DecisionMode) { if (elem != null) yield return elem; } - foreach (var elem in Answer) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Party) { if (elem != null) yield return new ElementValue("party", elem); } - if (Topic != null) yield return new ElementValue("topic", Topic); - if (Type != null) yield return new ElementValue("type", Type); - if (Decision != null) yield return new ElementValue("decision", Decision); - foreach (var elem in DecisionMode) { if (elem != null) yield return new ElementValue("decisionMode", elem); } - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1602,7 +1466,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1642,7 +1506,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1748,29 +1612,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return new ElementValue("reference", elem); } - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1786,7 +1628,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1802,7 +1644,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference?.Any() == true) yield return new KeyValuePair("reference",Reference); @@ -1883,27 +1725,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1916,7 +1738,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1929,7 +1751,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2319,55 +2141,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Scope != null) yield return Scope; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in TypeReference) { if (elem != null) yield return elem; } - foreach (var elem in Subtype) { if (elem != null) yield return elem; } - if (Relationship != null) yield return Relationship; - foreach (var elem in Context) { if (elem != null) yield return elem; } - if (ConditionElement != null) yield return ConditionElement; - foreach (var elem in PeriodType) { if (elem != null) yield return elem; } - foreach (var elem in Period) { if (elem != null) yield return elem; } - foreach (var elem in UsePeriod) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in Answer) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in ValuedItem) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Scope != null) yield return new ElementValue("scope", Scope); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in TypeReference) { if (elem != null) yield return new ElementValue("typeReference", elem); } - foreach (var elem in Subtype) { if (elem != null) yield return new ElementValue("subtype", elem); } - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - foreach (var elem in Context) { if (elem != null) yield return new ElementValue("context", elem); } - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - foreach (var elem in PeriodType) { if (elem != null) yield return new ElementValue("periodType", elem); } - foreach (var elem in Period) { if (elem != null) yield return new ElementValue("period", elem); } - foreach (var elem in UsePeriod) { if (elem != null) yield return new ElementValue("usePeriod", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - foreach (var elem in ValuedItem) { if (elem != null) yield return new ElementValue("valuedItem", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2422,7 +2196,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2477,7 +2251,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Scope is not null) yield return new KeyValuePair("scope",Scope); @@ -2621,31 +2395,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2664,7 +2414,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2683,7 +2433,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -3104,53 +2854,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Entity != null) yield return Entity; - if (Identifier != null) yield return Identifier; - if (EffectiveTimeElement != null) yield return EffectiveTimeElement; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (PointsElement != null) yield return PointsElement; - if (Net != null) yield return Net; - if (PaymentElement != null) yield return PaymentElement; - if (PaymentDateElement != null) yield return PaymentDateElement; - if (Responsible != null) yield return Responsible; - if (Recipient != null) yield return Recipient; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Entity != null) yield return new ElementValue("entity", Entity); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (EffectiveTimeElement != null) yield return new ElementValue("effectiveTime", EffectiveTimeElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (PointsElement != null) yield return new ElementValue("points", PointsElement); - if (Net != null) yield return new ElementValue("net", Net); - if (PaymentElement != null) yield return new ElementValue("payment", PaymentElement); - if (PaymentDateElement != null) yield return new ElementValue("paymentDate", PaymentDateElement); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Recipient != null) yield return new ElementValue("recipient", Recipient); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3202,7 +2906,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3254,7 +2958,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Entity is not null) yield return new KeyValuePair("entity",Entity); @@ -3790,63 +3494,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Type != null) yield return Type; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Intent != null) yield return Intent; - foreach (var elem in LinkIdElement) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (Context != null) yield return Context; - foreach (var elem in ContextLinkIdElement) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - foreach (var elem in Requester) { if (elem != null) yield return elem; } - foreach (var elem in RequesterLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in PerformerType) { if (elem != null) yield return elem; } - if (PerformerRole != null) yield return PerformerRole; - if (Performer != null) yield return Performer; - foreach (var elem in PerformerLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in ReasonLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Intent != null) yield return new ElementValue("intent", Intent); - foreach (var elem in LinkIdElement) { if (elem != null) yield return new ElementValue("linkId", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in ContextLinkIdElement) { if (elem != null) yield return new ElementValue("contextLinkId", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - foreach (var elem in Requester) { if (elem != null) yield return new ElementValue("requester", elem); } - foreach (var elem in RequesterLinkIdElement) { if (elem != null) yield return new ElementValue("requesterLinkId", elem); } - foreach (var elem in PerformerType) { if (elem != null) yield return new ElementValue("performerType", elem); } - if (PerformerRole != null) yield return new ElementValue("performerRole", PerformerRole); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in PerformerLinkIdElement) { if (elem != null) yield return new ElementValue("performerLinkId", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in ReasonLinkIdElement) { if (elem != null) yield return new ElementValue("reasonLinkId", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in SecurityLabelNumberElement) { if (elem != null) yield return new ElementValue("securityLabelNumber", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3913,7 +3561,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3980,7 +3628,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DoNotPerformElement is not null) yield return new KeyValuePair("doNotPerform",DoNotPerformElement); @@ -4094,29 +3742,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Reference) { if (elem != null) yield return new ElementValue("reference", elem); } - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4132,7 +3758,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4148,7 +3774,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference?.Any() == true) yield return new KeyValuePair("reference",Reference); @@ -4268,31 +3894,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - foreach (var elem in Signature) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - foreach (var elem in Signature) { if (elem != null) yield return new ElementValue("signature", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4311,7 +3913,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4330,7 +3932,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -4415,27 +4017,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4448,7 +4030,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4461,7 +4043,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -4544,27 +4126,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4577,7 +4139,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4590,7 +4152,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -4673,27 +4235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4706,7 +4248,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4719,7 +4261,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -5502,91 +5044,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (StatusElement != null) yield return StatusElement; - if (LegalState != null) yield return LegalState; - if (InstantiatesCanonical != null) yield return InstantiatesCanonical; - if (InstantiatesUriElement != null) yield return InstantiatesUriElement; - if (ContentDerivative != null) yield return ContentDerivative; - if (IssuedElement != null) yield return IssuedElement; - if (Applies != null) yield return Applies; - if (ExpirationType != null) yield return ExpirationType; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - foreach (var elem in Authority) { if (elem != null) yield return elem; } - foreach (var elem in Domain) { if (elem != null) yield return elem; } - foreach (var elem in Site) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (Author != null) yield return Author; - if (Scope != null) yield return Scope; - if (Topic != null) yield return Topic; - if (Type != null) yield return Type; - foreach (var elem in SubType) { if (elem != null) yield return elem; } - if (ContentDefinition != null) yield return ContentDefinition; - foreach (var elem in Term) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - foreach (var elem in Signer) { if (elem != null) yield return elem; } - foreach (var elem in Friendly) { if (elem != null) yield return elem; } - foreach (var elem in Legal) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - if (LegallyBinding != null) yield return LegallyBinding; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (LegalState != null) yield return new ElementValue("legalState", LegalState); - if (InstantiatesCanonical != null) yield return new ElementValue("instantiatesCanonical", InstantiatesCanonical); - if (InstantiatesUriElement != null) yield return new ElementValue("instantiatesUri", InstantiatesUriElement); - if (ContentDerivative != null) yield return new ElementValue("contentDerivative", ContentDerivative); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Applies != null) yield return new ElementValue("applies", Applies); - if (ExpirationType != null) yield return new ElementValue("expirationType", ExpirationType); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - foreach (var elem in Authority) { if (elem != null) yield return new ElementValue("authority", elem); } - foreach (var elem in Domain) { if (elem != null) yield return new ElementValue("domain", elem); } - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (Author != null) yield return new ElementValue("author", Author); - if (Scope != null) yield return new ElementValue("scope", Scope); - if (Topic != null) yield return new ElementValue("topic", Topic); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in SubType) { if (elem != null) yield return new ElementValue("subType", elem); } - if (ContentDefinition != null) yield return new ElementValue("contentDefinition", ContentDefinition); - foreach (var elem in Term) { if (elem != null) yield return new ElementValue("term", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - foreach (var elem in Signer) { if (elem != null) yield return new ElementValue("signer", elem); } - foreach (var elem in Friendly) { if (elem != null) yield return new ElementValue("friendly", elem); } - foreach (var elem in Legal) { if (elem != null) yield return new ElementValue("legal", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - if (LegallyBinding != null) yield return new ElementValue("legallyBinding", LegallyBinding); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5695,7 +5153,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5804,7 +5262,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs b/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs index 9faf6faba5..d56905175f 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Contributor.cs @@ -221,31 +221,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -264,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +259,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs b/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs index 1155ea6953..05c243e25d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Coverage.cs @@ -196,29 +196,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Party != null) yield return Party; - if (ResponsibilityElement != null) yield return ResponsibilityElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Party != null) yield return new ElementValue("party", Party); - if (ResponsibilityElement != null) yield return new ElementValue("responsibility", ResponsibilityElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -234,7 +212,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -250,7 +228,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Party is not null) yield return new KeyValuePair("party",Party); @@ -384,31 +362,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - if (NameElement != null) yield return NameElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - if (NameElement != null) yield return new ElementValue("name", NameElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -427,7 +381,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -446,7 +400,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -632,39 +586,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Category != null) yield return Category; - if (Network != null) yield return Network; - if (Unit != null) yield return Unit; - if (Term != null) yield return Term; - if (Value != null) yield return Value; - foreach (var elem in Exception) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Category != null) yield return new ElementValue("category", Category); - if (Network != null) yield return new ElementValue("network", Network); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Term != null) yield return new ElementValue("term", Term); - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Exception) { if (elem != null) yield return new ElementValue("exception", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -695,7 +617,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -726,7 +648,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -829,29 +751,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -867,7 +767,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -883,7 +783,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1388,65 +1288,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (KindElement != null) yield return KindElement; - foreach (var elem in PaymentBy) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (PolicyHolder != null) yield return PolicyHolder; - if (Subscriber != null) yield return Subscriber; - foreach (var elem in SubscriberId) { if (elem != null) yield return elem; } - if (Beneficiary != null) yield return Beneficiary; - if (DependentElement != null) yield return DependentElement; - if (Relationship != null) yield return Relationship; - if (Period != null) yield return Period; - if (Insurer != null) yield return Insurer; - foreach (var elem in Class) { if (elem != null) yield return elem; } - if (OrderElement != null) yield return OrderElement; - if (NetworkElement != null) yield return NetworkElement; - foreach (var elem in CostToBeneficiary) { if (elem != null) yield return elem; } - if (SubrogationElement != null) yield return SubrogationElement; - foreach (var elem in Contract) { if (elem != null) yield return elem; } - if (InsurancePlan != null) yield return InsurancePlan; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - foreach (var elem in PaymentBy) { if (elem != null) yield return new ElementValue("paymentBy", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (PolicyHolder != null) yield return new ElementValue("policyHolder", PolicyHolder); - if (Subscriber != null) yield return new ElementValue("subscriber", Subscriber); - foreach (var elem in SubscriberId) { if (elem != null) yield return new ElementValue("subscriberId", elem); } - if (Beneficiary != null) yield return new ElementValue("beneficiary", Beneficiary); - if (DependentElement != null) yield return new ElementValue("dependent", DependentElement); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Period != null) yield return new ElementValue("period", Period); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - foreach (var elem in Class) { if (elem != null) yield return new ElementValue("class", elem); } - if (OrderElement != null) yield return new ElementValue("order", OrderElement); - if (NetworkElement != null) yield return new ElementValue("network", NetworkElement); - foreach (var elem in CostToBeneficiary) { if (elem != null) yield return new ElementValue("costToBeneficiary", elem); } - if (SubrogationElement != null) yield return new ElementValue("subrogation", SubrogationElement); - foreach (var elem in Contract) { if (elem != null) yield return new ElementValue("contract", elem); } - if (InsurancePlan != null) yield return new ElementValue("insurancePlan", InsurancePlan); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1516,7 +1358,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1586,7 +1428,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs index 324eff3969..fd8f2f771a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityRequest.cs @@ -185,29 +185,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (When != null) yield return When; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (When != null) yield return new ElementValue("when", When); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -223,7 +201,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -239,7 +217,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -392,31 +370,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Information != null) yield return Information; - if (AppliesToAllElement != null) yield return AppliesToAllElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Information != null) yield return new ElementValue("information", Information); - if (AppliesToAllElement != null) yield return new ElementValue("appliesToAll", AppliesToAllElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -435,7 +389,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -454,7 +408,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -607,31 +561,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -650,7 +580,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -669,7 +599,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FocalElement is not null) yield return new KeyValuePair("focal",FocalElement); @@ -925,45 +855,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in SupportingInfoSequenceElement) { if (elem != null) yield return elem; } - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Provider != null) yield return Provider; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (Facility != null) yield return Facility; - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in SupportingInfoSequenceElement) { if (elem != null) yield return new ElementValue("supportingInfoSequence", elem); } - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (Facility != null) yield return new ElementValue("facility", Facility); - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1003,7 +895,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1043,7 +935,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SupportingInfoSequenceElement?.Any() == true) yield return new KeyValuePair("supportingInfoSequence",SupportingInfoSequenceElement); @@ -1135,27 +1027,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Diagnosis != null) yield return Diagnosis; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1168,7 +1040,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1181,7 +1053,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Diagnosis is not null) yield return new KeyValuePair("diagnosis",Diagnosis); @@ -1551,55 +1423,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Priority != null) yield return Priority; - foreach (var elem in PurposeElement) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - foreach (var elem in Event) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Provider != null) yield return Provider; - if (Insurer != null) yield return Insurer; - if (Facility != null) yield return Facility; - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Priority != null) yield return new ElementValue("priority", Priority); - foreach (var elem in PurposeElement) { if (elem != null) yield return new ElementValue("purpose", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Facility != null) yield return new ElementValue("facility", Facility); - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1654,7 +1478,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1709,7 +1533,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs index a350274366..9bd389f21e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/CoverageEligibilityResponse.cs @@ -219,29 +219,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (When != null) yield return When; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (When != null) yield return new ElementValue("when", When); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -257,7 +235,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -273,7 +251,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -424,33 +402,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Coverage != null) yield return Coverage; - if (InforceElement != null) yield return InforceElement; - if (BenefitPeriod != null) yield return BenefitPeriod; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (InforceElement != null) yield return new ElementValue("inforce", InforceElement); - if (BenefitPeriod != null) yield return new ElementValue("benefitPeriod", BenefitPeriod); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -472,7 +424,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -494,7 +446,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coverage is not null) yield return new KeyValuePair("coverage",Coverage); @@ -886,53 +838,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Provider != null) yield return Provider; - if (ExcludedElement != null) yield return ExcludedElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Network != null) yield return Network; - if (Unit != null) yield return Unit; - if (Term != null) yield return Term; - foreach (var elem in Benefit) { if (elem != null) yield return elem; } - if (AuthorizationRequiredElement != null) yield return AuthorizationRequiredElement; - foreach (var elem in AuthorizationSupporting) { if (elem != null) yield return elem; } - if (AuthorizationUrlElement != null) yield return AuthorizationUrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ExcludedElement != null) yield return new ElementValue("excluded", ExcludedElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Network != null) yield return new ElementValue("network", Network); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Term != null) yield return new ElementValue("term", Term); - foreach (var elem in Benefit) { if (elem != null) yield return new ElementValue("benefit", elem); } - if (AuthorizationRequiredElement != null) yield return new ElementValue("authorizationRequired", AuthorizationRequiredElement); - foreach (var elem in AuthorizationSupporting) { if (elem != null) yield return new ElementValue("authorizationSupporting", elem); } - if (AuthorizationUrlElement != null) yield return new ElementValue("authorizationUrl", AuthorizationUrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -984,7 +890,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1036,7 +942,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -1166,31 +1072,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Allowed != null) yield return Allowed; - if (Used != null) yield return Used; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Used != null) yield return new ElementValue("used", Used); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1209,7 +1091,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1228,7 +1110,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1346,29 +1228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in ExpressionElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in ExpressionElement) { if (elem != null) yield return new ElementValue("expression", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1384,7 +1244,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1400,7 +1260,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1842,57 +1702,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in PurposeElement) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - foreach (var elem in Event) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (CreatedElement != null) yield return CreatedElement; - if (Requestor != null) yield return Requestor; - if (Request != null) yield return Request; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (Insurer != null) yield return Insurer; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (PreAuthRefElement != null) yield return PreAuthRefElement; - if (Form != null) yield return Form; - foreach (var elem in Error) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in PurposeElement) { if (elem != null) yield return new ElementValue("purpose", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Requestor != null) yield return new ElementValue("requestor", Requestor); - if (Request != null) yield return new ElementValue("request", Request); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (PreAuthRefElement != null) yield return new ElementValue("preAuthRef", PreAuthRefElement); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1950,7 +1760,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2008,7 +1818,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs index d9a1d26473..1e853a5541 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DataRequirement.cs @@ -307,33 +307,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SearchParamElement != null) yield return SearchParamElement; - if (ValueSetElement != null) yield return ValueSetElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SearchParamElement != null) yield return new ElementValue("searchParam", SearchParamElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -355,7 +329,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -377,7 +351,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -529,31 +503,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SearchParamElement != null) yield return SearchParamElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SearchParamElement != null) yield return new ElementValue("searchParam", SearchParamElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -572,7 +522,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -591,7 +541,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -778,33 +728,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SearchParamElement != null) yield return SearchParamElement; - if (ComparatorElement != null) yield return ComparatorElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SearchParamElement != null) yield return new ElementValue("searchParam", SearchParamElement); - if (ComparatorElement != null) yield return new ElementValue("comparator", ComparatorElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -826,7 +750,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -848,7 +772,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -987,29 +911,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (DirectionElement != null) yield return DirectionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (DirectionElement != null) yield return new ElementValue("direction", DirectionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1025,7 +927,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1041,7 +943,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -1318,43 +1220,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in ProfileElement) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in MustSupportElement) { if (elem != null) yield return elem; } - foreach (var elem in CodeFilter) { if (elem != null) yield return elem; } - foreach (var elem in DateFilter) { if (elem != null) yield return elem; } - foreach (var elem in ValueFilter) { if (elem != null) yield return elem; } - if (LimitElement != null) yield return LimitElement; - foreach (var elem in Sort) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in ProfileElement) { if (elem != null) yield return new ElementValue("profile", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in MustSupportElement) { if (elem != null) yield return new ElementValue("mustSupport", elem); } - foreach (var elem in CodeFilter) { if (elem != null) yield return new ElementValue("codeFilter", elem); } - foreach (var elem in DateFilter) { if (elem != null) yield return new ElementValue("dateFilter", elem); } - foreach (var elem in ValueFilter) { if (elem != null) yield return new ElementValue("valueFilter", elem); } - if (LimitElement != null) yield return new ElementValue("limit", LimitElement); - foreach (var elem in Sort) { if (elem != null) yield return new ElementValue("sort", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1391,7 +1257,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1428,7 +1294,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs index 9dfe431de9..1b069b4d2d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DetectedIssue.cs @@ -213,29 +213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -251,7 +229,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -267,7 +245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -418,33 +396,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Action != null) yield return Action; - if (DateElement != null) yield return DateElement; - if (Author != null) yield return Author; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Action != null) yield return new ElementValue("action", Action); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -466,7 +418,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -488,7 +440,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action is not null) yield return new KeyValuePair("action",Action); @@ -858,53 +810,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (SeverityElement != null) yield return SeverityElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Identified != null) yield return Identified; - if (Author != null) yield return Author; - foreach (var elem in Implicated) { if (elem != null) yield return elem; } - foreach (var elem in Evidence) { if (elem != null) yield return elem; } - if (DetailElement != null) yield return DetailElement; - if (ReferenceElement != null) yield return ReferenceElement; - foreach (var elem in Mitigation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Identified != null) yield return new ElementValue("identified", Identified); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Implicated) { if (elem != null) yield return new ElementValue("implicated", elem); } - foreach (var elem in Evidence) { if (elem != null) yield return new ElementValue("evidence", elem); } - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - foreach (var elem in Mitigation) { if (elem != null) yield return new ElementValue("mitigation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -956,7 +862,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1008,7 +914,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Device.cs b/src/Hl7.Fhir.R5/Model/Generated/Device.cs index 736dfbac61..023629cd4e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Device.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Device.cs @@ -403,37 +403,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DeviceIdentifierElement != null) yield return DeviceIdentifierElement; - if (IssuerElement != null) yield return IssuerElement; - if (JurisdictionElement != null) yield return JurisdictionElement; - if (CarrierAIDCElement != null) yield return CarrierAIDCElement; - if (CarrierHRFElement != null) yield return CarrierHRFElement; - if (EntryTypeElement != null) yield return EntryTypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DeviceIdentifierElement != null) yield return new ElementValue("deviceIdentifier", DeviceIdentifierElement); - if (IssuerElement != null) yield return new ElementValue("issuer", IssuerElement); - if (JurisdictionElement != null) yield return new ElementValue("jurisdiction", JurisdictionElement); - if (CarrierAIDCElement != null) yield return new ElementValue("carrierAIDC", CarrierAIDCElement); - if (CarrierHRFElement != null) yield return new ElementValue("carrierHRF", CarrierHRFElement); - if (EntryTypeElement != null) yield return new ElementValue("entryType", EntryTypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -461,7 +431,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -489,7 +459,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DeviceIdentifierElement is not null) yield return new KeyValuePair("deviceIdentifier",DeviceIdentifierElement); @@ -663,31 +633,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ValueElement != null) yield return ValueElement; - if (TypeElement != null) yield return TypeElement; - if (DisplayElement != null) yield return DisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -706,7 +652,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -725,7 +671,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ValueElement is not null) yield return new KeyValuePair("value",ValueElement); @@ -889,33 +835,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Component != null) yield return Component; - if (InstallDateElement != null) yield return InstallDateElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Component != null) yield return new ElementValue("component", Component); - if (InstallDateElement != null) yield return new ElementValue("installDate", InstallDateElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -937,7 +857,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -959,7 +879,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1094,31 +1014,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Specification != null) yield return Specification; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Specification != null) yield return new ElementValue("specification", Specification); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1137,7 +1033,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1156,7 +1052,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -1259,29 +1155,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1297,7 +1171,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1313,7 +1187,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2083,89 +1957,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (DisplayNameElement != null) yield return DisplayNameElement; - if (Definition != null) yield return Definition; - foreach (var elem in UdiCarrier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (AvailabilityStatus != null) yield return AvailabilityStatus; - if (BiologicalSourceEvent != null) yield return BiologicalSourceEvent; - if (ManufacturerElement != null) yield return ManufacturerElement; - if (ManufactureDateElement != null) yield return ManufactureDateElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (LotNumberElement != null) yield return LotNumberElement; - if (SerialNumberElement != null) yield return SerialNumberElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - if (ModelNumberElement != null) yield return ModelNumberElement; - if (PartNumberElement != null) yield return PartNumberElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Version) { if (elem != null) yield return elem; } - foreach (var elem in ConformsTo) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - if (Mode != null) yield return Mode; - if (Cycle != null) yield return Cycle; - if (Duration != null) yield return Duration; - if (Owner != null) yield return Owner; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - foreach (var elem in Gateway) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Safety) { if (elem != null) yield return elem; } - if (Parent != null) yield return Parent; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (DisplayNameElement != null) yield return new ElementValue("displayName", DisplayNameElement); - if (Definition != null) yield return new ElementValue("definition", Definition); - foreach (var elem in UdiCarrier) { if (elem != null) yield return new ElementValue("udiCarrier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (AvailabilityStatus != null) yield return new ElementValue("availabilityStatus", AvailabilityStatus); - if (BiologicalSourceEvent != null) yield return new ElementValue("biologicalSourceEvent", BiologicalSourceEvent); - if (ManufacturerElement != null) yield return new ElementValue("manufacturer", ManufacturerElement); - if (ManufactureDateElement != null) yield return new ElementValue("manufactureDate", ManufactureDateElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (SerialNumberElement != null) yield return new ElementValue("serialNumber", SerialNumberElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - if (ModelNumberElement != null) yield return new ElementValue("modelNumber", ModelNumberElement); - if (PartNumberElement != null) yield return new ElementValue("partNumber", PartNumberElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in ConformsTo) { if (elem != null) yield return new ElementValue("conformsTo", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - if (Mode != null) yield return new ElementValue("mode", Mode); - if (Cycle != null) yield return new ElementValue("cycle", Cycle); - if (Duration != null) yield return new ElementValue("duration", Duration); - if (Owner != null) yield return new ElementValue("owner", Owner); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - foreach (var elem in Gateway) { if (elem != null) yield return new ElementValue("gateway", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Safety) { if (elem != null) yield return new ElementValue("safety", elem); } - if (Parent != null) yield return new ElementValue("parent", Parent); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2271,7 +2063,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2377,7 +2169,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs index 9e49f32a36..e4429e63bf 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceAssociation.cs @@ -201,31 +201,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Status != null) yield return Status; - foreach (var elem in Operator) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Status != null) yield return new ElementValue("status", Status); - foreach (var elem in Operator) { if (elem != null) yield return new ElementValue("operator", elem); } - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -244,7 +220,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -263,7 +239,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Status is not null) yield return new KeyValuePair("status",Status); @@ -472,43 +448,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Device != null) yield return Device; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - foreach (var elem in StatusReason) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (BodyStructure != null) yield return BodyStructure; - if (Period != null) yield return Period; - foreach (var elem in Operation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Status != null) yield return new ElementValue("status", Status); - foreach (var elem in StatusReason) { if (elem != null) yield return new ElementValue("statusReason", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (BodyStructure != null) yield return new ElementValue("bodyStructure", BodyStructure); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Operation) { if (elem != null) yield return new ElementValue("operation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -545,7 +485,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -582,7 +522,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs index 59ae062fc0..980d59c980 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceDefinition.cs @@ -339,33 +339,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DeviceIdentifierElement != null) yield return DeviceIdentifierElement; - if (IssuerElement != null) yield return IssuerElement; - if (JurisdictionElement != null) yield return JurisdictionElement; - foreach (var elem in MarketDistribution) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DeviceIdentifierElement != null) yield return new ElementValue("deviceIdentifier", DeviceIdentifierElement); - if (IssuerElement != null) yield return new ElementValue("issuer", IssuerElement); - if (JurisdictionElement != null) yield return new ElementValue("jurisdiction", JurisdictionElement); - foreach (var elem in MarketDistribution) { if (elem != null) yield return new ElementValue("marketDistribution", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -387,7 +361,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -409,7 +383,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DeviceIdentifierElement is not null) yield return new KeyValuePair("deviceIdentifier",DeviceIdentifierElement); @@ -527,29 +501,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MarketPeriod != null) yield return MarketPeriod; - if (SubJurisdictionElement != null) yield return SubJurisdictionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MarketPeriod != null) yield return new ElementValue("marketPeriod", MarketPeriod); - if (SubJurisdictionElement != null) yield return new ElementValue("subJurisdiction", SubJurisdictionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -565,7 +517,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -581,7 +533,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MarketPeriod is not null) yield return new KeyValuePair("marketPeriod",MarketPeriod); @@ -788,33 +740,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (DeviceIdentifierElement != null) yield return DeviceIdentifierElement; - if (IssuerElement != null) yield return IssuerElement; - if (JurisdictionElement != null) yield return JurisdictionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DeviceIdentifierElement != null) yield return new ElementValue("deviceIdentifier", DeviceIdentifierElement); - if (IssuerElement != null) yield return new ElementValue("issuer", IssuerElement); - if (JurisdictionElement != null) yield return new ElementValue("jurisdiction", JurisdictionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -836,7 +762,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -858,7 +784,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -993,29 +919,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1031,7 +935,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1047,7 +951,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1146,29 +1050,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Justification) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Justification) { if (elem != null) yield return new ElementValue("justification", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1184,7 +1066,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1200,7 +1082,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1351,33 +1233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Specification != null) yield return Specification; - foreach (var elem in VersionElement) { if (elem != null) yield return elem; } - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Specification != null) yield return new ElementValue("specification", Specification); - foreach (var elem in VersionElement) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1399,7 +1255,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1421,7 +1277,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -1540,29 +1396,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - if (CountElement != null) yield return CountElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - if (CountElement != null) yield return new ElementValue("count", CountElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1578,7 +1412,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1594,7 +1428,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -1772,37 +1606,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Type != null) yield return Type; - if (CountElement != null) yield return CountElement; - foreach (var elem in Distributor) { if (elem != null) yield return elem; } - foreach (var elem in UdiDeviceIdentifier) { if (elem != null) yield return elem; } - foreach (var elem in Packaging) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Type != null) yield return new ElementValue("type", Type); - if (CountElement != null) yield return new ElementValue("count", CountElement); - foreach (var elem in Distributor) { if (elem != null) yield return new ElementValue("distributor", elem); } - foreach (var elem in UdiDeviceIdentifier) { if (elem != null) yield return new ElementValue("udiDeviceIdentifier", elem); } - foreach (var elem in Packaging) { if (elem != null) yield return new ElementValue("packaging", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1830,7 +1634,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1858,7 +1662,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1976,29 +1780,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in OrganizationReference) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in OrganizationReference) { if (elem != null) yield return new ElementValue("organizationReference", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2014,7 +1796,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2030,7 +1812,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2158,31 +1940,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Component != null) yield return Component; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Component != null) yield return new ElementValue("component", Component); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2201,7 +1959,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2220,7 +1978,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2323,29 +2081,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2361,7 +2097,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2377,7 +2113,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2473,29 +2209,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Relation != null) yield return Relation; - if (RelatedDevice != null) yield return RelatedDevice; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Relation != null) yield return new ElementValue("relation", Relation); - if (RelatedDevice != null) yield return new ElementValue("relatedDevice", RelatedDevice); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2511,7 +2225,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2527,7 +2241,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Relation is not null) yield return new KeyValuePair("relation",Relation); @@ -2673,31 +2387,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - if (AlternateElement != null) yield return AlternateElement; - if (AllergenicIndicatorElement != null) yield return AllergenicIndicatorElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - if (AlternateElement != null) yield return new ElementValue("alternate", AlternateElement); - if (AllergenicIndicatorElement != null) yield return new ElementValue("allergenicIndicator", AllergenicIndicatorElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2716,7 +2406,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2735,7 +2425,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -2953,39 +2643,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - if (UsageInstructionElement != null) yield return UsageInstructionElement; - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Indication) { if (elem != null) yield return elem; } - foreach (var elem in Contraindication) { if (elem != null) yield return elem; } - foreach (var elem in Warning) { if (elem != null) yield return elem; } - if (IntendedUseElement != null) yield return IntendedUseElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - if (UsageInstructionElement != null) yield return new ElementValue("usageInstruction", UsageInstructionElement); - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Indication) { if (elem != null) yield return new ElementValue("indication", elem); } - foreach (var elem in Contraindication) { if (elem != null) yield return new ElementValue("contraindication", elem); } - foreach (var elem in Warning) { if (elem != null) yield return new ElementValue("warning", elem); } - if (IntendedUseElement != null) yield return new ElementValue("intendedUse", IntendedUseElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3016,7 +2674,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3047,7 +2705,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseContext?.Any() == true) yield return new KeyValuePair("useContext",UseContext); @@ -3201,31 +2859,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RecallElement != null) yield return RecallElement; - if (ScopeElement != null) yield return ScopeElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RecallElement != null) yield return new ElementValue("recall", RecallElement); - if (ScopeElement != null) yield return new ElementValue("scope", ScopeElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3244,7 +2878,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3263,7 +2897,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RecallElement is not null) yield return new KeyValuePair("recall",RecallElement); @@ -3392,33 +3026,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ChargeItemCode != null) yield return ChargeItemCode; - if (Count != null) yield return Count; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ChargeItemCode != null) yield return new ElementValue("chargeItemCode", ChargeItemCode); - if (Count != null) yield return new ElementValue("count", Count); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3440,7 +3048,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3462,7 +3070,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ChargeItemCode is not null) yield return new KeyValuePair("chargeItemCode",ChargeItemCode); @@ -4028,77 +3636,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in UdiDeviceIdentifier) { if (elem != null) yield return elem; } - foreach (var elem in RegulatoryIdentifier) { if (elem != null) yield return elem; } - if (PartNumberElement != null) yield return PartNumberElement; - if (Manufacturer != null) yield return Manufacturer; - foreach (var elem in DeviceName) { if (elem != null) yield return elem; } - if (ModelNumberElement != null) yield return ModelNumberElement; - foreach (var elem in Classification) { if (elem != null) yield return elem; } - foreach (var elem in ConformsTo) { if (elem != null) yield return elem; } - foreach (var elem in HasPart) { if (elem != null) yield return elem; } - foreach (var elem in Packaging) { if (elem != null) yield return elem; } - foreach (var elem in Version) { if (elem != null) yield return elem; } - foreach (var elem in Safety) { if (elem != null) yield return elem; } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return elem; } - foreach (var elem in LanguageCode) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Link) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Material) { if (elem != null) yield return elem; } - foreach (var elem in ProductionIdentifierInUDIElement) { if (elem != null) yield return elem; } - if (Guideline != null) yield return Guideline; - if (CorrectiveAction != null) yield return CorrectiveAction; - foreach (var elem in ChargeItem) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in UdiDeviceIdentifier) { if (elem != null) yield return new ElementValue("udiDeviceIdentifier", elem); } - foreach (var elem in RegulatoryIdentifier) { if (elem != null) yield return new ElementValue("regulatoryIdentifier", elem); } - if (PartNumberElement != null) yield return new ElementValue("partNumber", PartNumberElement); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - foreach (var elem in DeviceName) { if (elem != null) yield return new ElementValue("deviceName", elem); } - if (ModelNumberElement != null) yield return new ElementValue("modelNumber", ModelNumberElement); - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - foreach (var elem in ConformsTo) { if (elem != null) yield return new ElementValue("conformsTo", elem); } - foreach (var elem in HasPart) { if (elem != null) yield return new ElementValue("hasPart", elem); } - foreach (var elem in Packaging) { if (elem != null) yield return new ElementValue("packaging", elem); } - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in Safety) { if (elem != null) yield return new ElementValue("safety", elem); } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return new ElementValue("shelfLifeStorage", elem); } - foreach (var elem in LanguageCode) { if (elem != null) yield return new ElementValue("languageCode", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Material) { if (elem != null) yield return new ElementValue("material", elem); } - foreach (var elem in ProductionIdentifierInUDIElement) { if (elem != null) yield return new ElementValue("productionIdentifierInUDI", elem); } - if (Guideline != null) yield return new ElementValue("guideline", Guideline); - if (CorrectiveAction != null) yield return new ElementValue("correctiveAction", CorrectiveAction); - foreach (var elem in ChargeItem) { if (elem != null) yield return new ElementValue("chargeItem", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4186,7 +3724,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4274,7 +3812,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs index 869e265088..812b0b8e22 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceDispense.cs @@ -213,29 +213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -251,7 +229,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -267,7 +245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -757,67 +735,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Device != null) yield return Device; - if (Subject != null) yield return Subject; - if (Receiver != null) yield return Receiver; - if (Encounter != null) yield return Encounter; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - if (PreparedDateElement != null) yield return PreparedDateElement; - if (WhenHandedOverElement != null) yield return WhenHandedOverElement; - if (Destination != null) yield return Destination; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (UsageInstructionElement != null) yield return UsageInstructionElement; - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Device != null) yield return new ElementValue("device", Device); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Receiver != null) yield return new ElementValue("receiver", Receiver); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (PreparedDateElement != null) yield return new ElementValue("preparedDate", PreparedDateElement); - if (WhenHandedOverElement != null) yield return new ElementValue("whenHandedOver", WhenHandedOverElement); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (UsageInstructionElement != null) yield return new ElementValue("usageInstruction", UsageInstructionElement); - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -890,7 +808,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -963,7 +881,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs index b35d9509cd..0c8f20872b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceMetric.cs @@ -354,31 +354,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (StateElement != null) yield return StateElement; - if (TimeElement != null) yield return TimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (StateElement != null) yield return new ElementValue("state", StateElement); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -397,7 +373,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -416,7 +392,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -678,43 +654,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Unit != null) yield return Unit; - if (Device != null) yield return Device; - if (OperationalStatusElement != null) yield return OperationalStatusElement; - if (ColorElement != null) yield return ColorElement; - if (CategoryElement != null) yield return CategoryElement; - if (MeasurementFrequency != null) yield return MeasurementFrequency; - foreach (var elem in Calibration) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Device != null) yield return new ElementValue("device", Device); - if (OperationalStatusElement != null) yield return new ElementValue("operationalStatus", OperationalStatusElement); - if (ColorElement != null) yield return new ElementValue("color", ColorElement); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - if (MeasurementFrequency != null) yield return new ElementValue("measurementFrequency", MeasurementFrequency); - foreach (var elem in Calibration) { if (elem != null) yield return new ElementValue("calibration", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -751,7 +691,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -788,7 +728,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs index 99682d6e16..15c8c275ce 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceRequest.cs @@ -149,29 +149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -187,7 +165,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -203,7 +181,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -871,77 +849,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Code != null) yield return Code; - if (QuantityElement != null) yield return QuantityElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (Performer != null) yield return Performer; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (AsNeededElement != null) yield return AsNeededElement; - if (AsNeededFor != null) yield return AsNeededFor; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Code != null) yield return new ElementValue("code", Code); - if (QuantityElement != null) yield return new ElementValue("quantity", QuantityElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (AsNeededElement != null) yield return new ElementValue("asNeeded", AsNeededElement); - if (AsNeededFor != null) yield return new ElementValue("asNeededFor", AsNeededFor); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1029,7 +937,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1117,7 +1025,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs b/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs index 55918b3339..098a9f4709 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DeviceUsage.cs @@ -202,29 +202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -240,7 +218,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -256,7 +234,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -640,59 +618,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - if (Context != null) yield return Context; - if (Timing != null) yield return Timing; - if (DateAssertedElement != null) yield return DateAssertedElement; - if (UsageStatus != null) yield return UsageStatus; - foreach (var elem in UsageReason) { if (elem != null) yield return elem; } - if (Adherence != null) yield return Adherence; - if (InformationSource != null) yield return InformationSource; - if (Device != null) yield return Device; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - if (Context != null) yield return new ElementValue("context", Context); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (DateAssertedElement != null) yield return new ElementValue("dateAsserted", DateAssertedElement); - if (UsageStatus != null) yield return new ElementValue("usageStatus", UsageStatus); - foreach (var elem in UsageReason) { if (elem != null) yield return new ElementValue("usageReason", elem); } - if (Adherence != null) yield return new ElementValue("adherence", Adherence); - if (InformationSource != null) yield return new ElementValue("informationSource", InformationSource); - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -753,7 +679,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -814,7 +740,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs index 51718c0809..39caff8b40 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DiagnosticReport.cs @@ -228,29 +228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -266,7 +244,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -282,7 +260,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -399,29 +377,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CommentElement != null) yield return CommentElement; - if (Link != null) yield return Link; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (Link != null) yield return new ElementValue("link", Link); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -437,7 +393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -453,7 +409,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CommentElement is not null) yield return new KeyValuePair("comment",CommentElement); @@ -933,67 +889,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in ResultsInterpreter) { if (elem != null) yield return elem; } - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - foreach (var elem in Result) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Study) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Media) { if (elem != null) yield return elem; } - if (Composition != null) yield return Composition; - if (ConclusionElement != null) yield return ConclusionElement; - foreach (var elem in ConclusionCode) { if (elem != null) yield return elem; } - foreach (var elem in PresentedForm) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in ResultsInterpreter) { if (elem != null) yield return new ElementValue("resultsInterpreter", elem); } - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - foreach (var elem in Result) { if (elem != null) yield return new ElementValue("result", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Study) { if (elem != null) yield return new ElementValue("study", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Media) { if (elem != null) yield return new ElementValue("media", elem); } - if (Composition != null) yield return new ElementValue("composition", Composition); - if (ConclusionElement != null) yield return new ElementValue("conclusion", ConclusionElement); - foreach (var elem in ConclusionCode) { if (elem != null) yield return new ElementValue("conclusionCode", elem); } - foreach (var elem in PresentedForm) { if (elem != null) yield return new ElementValue("presentedForm", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1066,7 +962,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1139,7 +1035,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs index 78278700a3..1c84ca32b4 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/DocumentReference.cs @@ -214,31 +214,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Mode != null) yield return Mode; - if (TimeElement != null) yield return TimeElement; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Mode != null) yield return new ElementValue("mode", Mode); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -257,7 +233,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -276,7 +252,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Mode is not null) yield return new KeyValuePair("mode",Mode); @@ -379,29 +355,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -417,7 +371,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -433,7 +387,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -532,29 +486,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Attachment != null) yield return Attachment; - foreach (var elem in Profile) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Attachment != null) yield return new ElementValue("attachment", Attachment); - foreach (var elem in Profile) { if (elem != null) yield return new ElementValue("profile", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -570,7 +502,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -586,7 +518,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Attachment is not null) yield return new KeyValuePair("attachment",Attachment); @@ -672,27 +604,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -705,7 +617,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -718,7 +630,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -1260,71 +1172,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (DocStatusElement != null) yield return DocStatusElement; - foreach (var elem in Modality) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in Context) { if (elem != null) yield return elem; } - foreach (var elem in Event) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (FacilityType != null) yield return FacilityType; - if (PracticeSetting != null) yield return PracticeSetting; - if (Period != null) yield return Period; - if (DateElement != null) yield return DateElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Attester) { if (elem != null) yield return elem; } - if (Custodian != null) yield return Custodian; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Content) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DocStatusElement != null) yield return new ElementValue("docStatus", DocStatusElement); - foreach (var elem in Modality) { if (elem != null) yield return new ElementValue("modality", elem); } - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Context) { if (elem != null) yield return new ElementValue("context", elem); } - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (FacilityType != null) yield return new ElementValue("facilityType", FacilityType); - if (PracticeSetting != null) yield return new ElementValue("practiceSetting", PracticeSetting); - if (Period != null) yield return new ElementValue("period", Period); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Attester) { if (elem != null) yield return new ElementValue("attester", elem); } - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1403,7 +1251,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1482,7 +1330,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs b/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs index 8cddb0447e..c01084d518 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Dosage.cs @@ -167,31 +167,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Dose != null) yield return Dose; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Dose != null) yield return new ElementValue("dose", Dose); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -229,7 +205,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -583,53 +559,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in AdditionalInstruction) { if (elem != null) yield return elem; } - if (PatientInstructionElement != null) yield return PatientInstructionElement; - if (Timing != null) yield return Timing; - if (AsNeededElement != null) yield return AsNeededElement; - foreach (var elem in AsNeededFor) { if (elem != null) yield return elem; } - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (Method != null) yield return Method; - foreach (var elem in DoseAndRate) { if (elem != null) yield return elem; } - foreach (var elem in MaxDosePerPeriod) { if (elem != null) yield return elem; } - if (MaxDosePerAdministration != null) yield return MaxDosePerAdministration; - if (MaxDosePerLifetime != null) yield return MaxDosePerLifetime; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in AdditionalInstruction) { if (elem != null) yield return new ElementValue("additionalInstruction", elem); } - if (PatientInstructionElement != null) yield return new ElementValue("patientInstruction", PatientInstructionElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (AsNeededElement != null) yield return new ElementValue("asNeeded", AsNeededElement); - foreach (var elem in AsNeededFor) { if (elem != null) yield return new ElementValue("asNeededFor", elem); } - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (Method != null) yield return new ElementValue("method", Method); - foreach (var elem in DoseAndRate) { if (elem != null) yield return new ElementValue("doseAndRate", elem); } - foreach (var elem in MaxDosePerPeriod) { if (elem != null) yield return new ElementValue("maxDosePerPeriod", elem); } - if (MaxDosePerAdministration != null) yield return new ElementValue("maxDosePerAdministration", MaxDosePerAdministration); - if (MaxDosePerLifetime != null) yield return new ElementValue("maxDosePerLifetime", MaxDosePerLifetime); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -681,7 +611,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -733,7 +663,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs b/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs index 01366c5a5b..b6ac9d27e7 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Encounter.cs @@ -203,31 +203,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -246,7 +222,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -265,7 +241,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -369,29 +345,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Use) { if (elem != null) yield return elem; } - foreach (var elem in Value) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Use) { if (elem != null) yield return new ElementValue("use", elem); } - foreach (var elem in Value) { if (elem != null) yield return new ElementValue("value", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -407,7 +361,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -423,7 +377,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Use?.Any() == true) yield return new KeyValuePair("use",Use); @@ -523,29 +477,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Use) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Use) { if (elem != null) yield return new ElementValue("use", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -561,7 +493,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -577,7 +509,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Condition?.Any() == true) yield return new KeyValuePair("condition",Condition); @@ -747,37 +679,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PreAdmissionIdentifier != null) yield return PreAdmissionIdentifier; - if (Origin != null) yield return Origin; - if (AdmitSource != null) yield return AdmitSource; - if (ReAdmission != null) yield return ReAdmission; - if (Destination != null) yield return Destination; - if (DischargeDisposition != null) yield return DischargeDisposition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PreAdmissionIdentifier != null) yield return new ElementValue("preAdmissionIdentifier", PreAdmissionIdentifier); - if (Origin != null) yield return new ElementValue("origin", Origin); - if (AdmitSource != null) yield return new ElementValue("admitSource", AdmitSource); - if (ReAdmission != null) yield return new ElementValue("reAdmission", ReAdmission); - if (Destination != null) yield return new ElementValue("destination", Destination); - if (DischargeDisposition != null) yield return new ElementValue("dischargeDisposition", DischargeDisposition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -805,7 +707,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -833,7 +735,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PreAdmissionIdentifier is not null) yield return new KeyValuePair("preAdmissionIdentifier",PreAdmissionIdentifier); @@ -990,33 +892,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Location != null) yield return Location; - if (StatusElement != null) yield return StatusElement; - if (Form != null) yield return Form; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Location != null) yield return new ElementValue("location", Location); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Form != null) yield return new ElementValue("form", Form); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1038,7 +914,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1060,7 +936,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Location is not null) yield return new KeyValuePair("location",Location); @@ -1658,81 +1534,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Class) { if (elem != null) yield return elem; } - if (Priority != null) yield return Priority; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (SubjectStatus != null) yield return SubjectStatus; - foreach (var elem in EpisodeOfCare) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - if (PartOf != null) yield return PartOf; - if (ServiceProvider != null) yield return ServiceProvider; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in Appointment) { if (elem != null) yield return elem; } - foreach (var elem in VirtualService) { if (elem != null) yield return elem; } - if (ActualPeriod != null) yield return ActualPeriod; - if (PlannedStartDateElement != null) yield return PlannedStartDateElement; - if (PlannedEndDateElement != null) yield return PlannedEndDateElement; - if (Length != null) yield return Length; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - foreach (var elem in DietPreference) { if (elem != null) yield return elem; } - foreach (var elem in SpecialArrangement) { if (elem != null) yield return elem; } - foreach (var elem in SpecialCourtesy) { if (elem != null) yield return elem; } - if (Admission != null) yield return Admission; - foreach (var elem in Location) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Class) { if (elem != null) yield return new ElementValue("class", elem); } - if (Priority != null) yield return new ElementValue("priority", Priority); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (SubjectStatus != null) yield return new ElementValue("subjectStatus", SubjectStatus); - foreach (var elem in EpisodeOfCare) { if (elem != null) yield return new ElementValue("episodeOfCare", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - if (ServiceProvider != null) yield return new ElementValue("serviceProvider", ServiceProvider); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in Appointment) { if (elem != null) yield return new ElementValue("appointment", elem); } - foreach (var elem in VirtualService) { if (elem != null) yield return new ElementValue("virtualService", elem); } - if (ActualPeriod != null) yield return new ElementValue("actualPeriod", ActualPeriod); - if (PlannedStartDateElement != null) yield return new ElementValue("plannedStartDate", PlannedStartDateElement); - if (PlannedEndDateElement != null) yield return new ElementValue("plannedEndDate", PlannedEndDateElement); - if (Length != null) yield return new ElementValue("length", Length); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - foreach (var elem in DietPreference) { if (elem != null) yield return new ElementValue("dietPreference", elem); } - foreach (var elem in SpecialArrangement) { if (elem != null) yield return new ElementValue("specialArrangement", elem); } - foreach (var elem in SpecialCourtesy) { if (elem != null) yield return new ElementValue("specialCourtesy", elem); } - if (Admission != null) yield return new ElementValue("admission", Admission); - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1826,7 +1628,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1920,7 +1722,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs b/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs index c184ea1470..05826f2774 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EncounterHistory.cs @@ -151,29 +151,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Location != null) yield return Location; - if (Form != null) yield return Form; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Location != null) yield return new ElementValue("location", Location); - if (Form != null) yield return new ElementValue("form", Form); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -189,7 +167,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -205,7 +183,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Location is not null) yield return new KeyValuePair("location",Location); @@ -533,51 +511,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Encounter != null) yield return Encounter; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Class != null) yield return Class; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (SubjectStatus != null) yield return SubjectStatus; - if (ActualPeriod != null) yield return ActualPeriod; - if (PlannedStartDateElement != null) yield return PlannedStartDateElement; - if (PlannedEndDateElement != null) yield return PlannedEndDateElement; - if (Length != null) yield return Length; - foreach (var elem in Location) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Class != null) yield return new ElementValue("class", Class); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (SubjectStatus != null) yield return new ElementValue("subjectStatus", SubjectStatus); - if (ActualPeriod != null) yield return new ElementValue("actualPeriod", ActualPeriod); - if (PlannedStartDateElement != null) yield return new ElementValue("plannedStartDate", PlannedStartDateElement); - if (PlannedEndDateElement != null) yield return new ElementValue("plannedEndDate", PlannedEndDateElement); - if (Length != null) yield return new ElementValue("length", Length); - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -626,7 +560,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -675,7 +609,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Encounter is not null) yield return new KeyValuePair("encounter",Encounter); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs index 30e9d15290..ddd95deca9 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Endpoint.cs @@ -209,29 +209,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in MimeTypeElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in MimeTypeElement) { if (elem != null) yield return new ElementValue("mimeType", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -247,7 +225,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -263,7 +241,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -609,49 +587,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in ConnectionType) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in EnvironmentType) { if (elem != null) yield return elem; } - if (ManagingOrganization != null) yield return ManagingOrganization; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in Payload) { if (elem != null) yield return elem; } - if (AddressElement != null) yield return AddressElement; - foreach (var elem in HeaderElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in ConnectionType) { if (elem != null) yield return new ElementValue("connectionType", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in EnvironmentType) { if (elem != null) yield return new ElementValue("environmentType", elem); } - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Payload) { if (elem != null) yield return new ElementValue("payload", elem); } - if (AddressElement != null) yield return new ElementValue("address", AddressElement); - foreach (var elem in HeaderElement) { if (elem != null) yield return new ElementValue("header", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -697,7 +633,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -743,7 +679,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs index eeb67ac26e..76e1fcdbbf 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentRequest.cs @@ -259,39 +259,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CreatedElement != null) yield return CreatedElement; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Candidate != null) yield return Candidate; - if (Coverage != null) yield return Coverage; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Candidate != null) yield return new ElementValue("candidate", Candidate); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -322,7 +290,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -353,7 +321,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs index 5f59243c8e..dc7af84456 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EnrollmentResponse.cs @@ -345,41 +345,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Request != null) yield return Request; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (CreatedElement != null) yield return CreatedElement; - if (Organization != null) yield return Organization; - if (RequestProvider != null) yield return RequestProvider; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Request != null) yield return new ElementValue("request", Request); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (RequestProvider != null) yield return new ElementValue("requestProvider", RequestProvider); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -413,7 +379,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -447,7 +413,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs index 3d30b9ce02..5992c8a188 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EpisodeOfCare.cs @@ -220,29 +220,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -258,7 +236,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -274,7 +252,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); @@ -376,29 +354,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Use != null) yield return Use; - foreach (var elem in Value) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Use != null) yield return new ElementValue("use", Use); - foreach (var elem in Value) { if (elem != null) yield return new ElementValue("value", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -414,7 +370,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -430,7 +386,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Use is not null) yield return new KeyValuePair("use",Use); @@ -530,29 +486,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Condition) { if (elem != null) yield return elem; } - if (Use != null) yield return Use; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - if (Use != null) yield return new ElementValue("use", Use); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -568,7 +502,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -584,7 +518,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Condition?.Any() == true) yield return new KeyValuePair("condition",Condition); @@ -885,51 +819,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusHistory) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (Period != null) yield return Period; - foreach (var elem in ReferralRequest) { if (elem != null) yield return elem; } - if (CareManager != null) yield return CareManager; - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusHistory) { if (elem != null) yield return new ElementValue("statusHistory", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in ReferralRequest) { if (elem != null) yield return new ElementValue("referralRequest", elem); } - if (CareManager != null) yield return new ElementValue("careManager", CareManager); - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -978,7 +868,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1027,7 +917,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs index 2ad2d0ddf6..8c8b7b761b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EventDefinition.cs @@ -890,85 +890,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Trigger) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Trigger) { if (elem != null) yield return new ElementValue("trigger", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1068,7 +990,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1168,7 +1090,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs b/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs index 085f59c07c..957c3457ae 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Evidence.cs @@ -233,37 +233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (VariableRole != null) yield return VariableRole; - if (Observed != null) yield return Observed; - if (Intended != null) yield return Intended; - if (DirectnessMatch != null) yield return DirectnessMatch; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (VariableRole != null) yield return new ElementValue("variableRole", VariableRole); - if (Observed != null) yield return new ElementValue("observed", Observed); - if (Intended != null) yield return new ElementValue("intended", Intended); - if (DirectnessMatch != null) yield return new ElementValue("directnessMatch", DirectnessMatch); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -291,7 +261,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -319,7 +289,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -602,45 +572,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (StatisticType != null) yield return StatisticType; - if (Category != null) yield return Category; - if (Quantity != null) yield return Quantity; - if (NumberOfEventsElement != null) yield return NumberOfEventsElement; - if (NumberAffectedElement != null) yield return NumberAffectedElement; - if (SampleSize != null) yield return SampleSize; - foreach (var elem in AttributeEstimate) { if (elem != null) yield return elem; } - foreach (var elem in ModelCharacteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (StatisticType != null) yield return new ElementValue("statisticType", StatisticType); - if (Category != null) yield return new ElementValue("category", Category); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (NumberOfEventsElement != null) yield return new ElementValue("numberOfEvents", NumberOfEventsElement); - if (NumberAffectedElement != null) yield return new ElementValue("numberAffected", NumberAffectedElement); - if (SampleSize != null) yield return new ElementValue("sampleSize", SampleSize); - foreach (var elem in AttributeEstimate) { if (elem != null) yield return new ElementValue("attributeEstimate", elem); } - foreach (var elem in ModelCharacteristic) { if (elem != null) yield return new ElementValue("modelCharacteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -680,7 +612,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -720,7 +652,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -942,35 +874,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (NumberOfStudiesElement != null) yield return NumberOfStudiesElement; - if (NumberOfParticipantsElement != null) yield return NumberOfParticipantsElement; - if (KnownDataCountElement != null) yield return KnownDataCountElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (NumberOfStudiesElement != null) yield return new ElementValue("numberOfStudies", NumberOfStudiesElement); - if (NumberOfParticipantsElement != null) yield return new ElementValue("numberOfParticipants", NumberOfParticipantsElement); - if (KnownDataCountElement != null) yield return new ElementValue("knownDataCount", KnownDataCountElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -995,7 +899,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1020,7 +924,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1238,39 +1142,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - if (LevelElement != null) yield return LevelElement; - if (Range != null) yield return Range; - foreach (var elem in AttributeEstimate) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (LevelElement != null) yield return new ElementValue("level", LevelElement); - if (Range != null) yield return new ElementValue("range", Range); - foreach (var elem in AttributeEstimate) { if (elem != null) yield return new ElementValue("attributeEstimate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1301,7 +1173,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1332,7 +1204,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1469,33 +1341,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - foreach (var elem in Variable) { if (elem != null) yield return elem; } - foreach (var elem in AttributeEstimate) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Variable) { if (elem != null) yield return new ElementValue("variable", elem); } - foreach (var elem in AttributeEstimate) { if (elem != null) yield return new ElementValue("attributeEstimate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1517,7 +1363,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1539,7 +1385,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1708,35 +1554,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (VariableDefinition != null) yield return VariableDefinition; - if (HandlingElement != null) yield return HandlingElement; - foreach (var elem in ValueCategory) { if (elem != null) yield return elem; } - foreach (var elem in ValueQuantity) { if (elem != null) yield return elem; } - foreach (var elem in ValueRange) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (VariableDefinition != null) yield return new ElementValue("variableDefinition", VariableDefinition); - if (HandlingElement != null) yield return new ElementValue("handling", HandlingElement); - foreach (var elem in ValueCategory) { if (elem != null) yield return new ElementValue("valueCategory", elem); } - foreach (var elem in ValueQuantity) { if (elem != null) yield return new ElementValue("valueQuantity", elem); } - foreach (var elem in ValueRange) { if (elem != null) yield return new ElementValue("valueRange", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1761,7 +1579,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1786,7 +1604,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VariableDefinition is not null) yield return new KeyValuePair("variableDefinition",VariableDefinition); @@ -1989,37 +1807,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Rating != null) yield return Rating; - if (RaterElement != null) yield return RaterElement; - foreach (var elem in Subcomponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Rating != null) yield return new ElementValue("rating", Rating); - if (RaterElement != null) yield return new ElementValue("rater", RaterElement); - foreach (var elem in Subcomponent) { if (elem != null) yield return new ElementValue("subcomponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2047,7 +1835,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2075,7 +1863,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -2918,87 +2706,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (CiteAs != null) yield return CiteAs; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (AssertionElement != null) yield return AssertionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in VariableDefinition) { if (elem != null) yield return elem; } - if (SynthesisType != null) yield return SynthesisType; - foreach (var elem in StudyDesign) { if (elem != null) yield return elem; } - foreach (var elem in Statistic) { if (elem != null) yield return elem; } - foreach (var elem in Certainty) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (CiteAs != null) yield return new ElementValue("citeAs", CiteAs); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (AssertionElement != null) yield return new ElementValue("assertion", AssertionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in VariableDefinition) { if (elem != null) yield return new ElementValue("variableDefinition", elem); } - if (SynthesisType != null) yield return new ElementValue("synthesisType", SynthesisType); - foreach (var elem in StudyDesign) { if (elem != null) yield return new ElementValue("studyDesign", elem); } - foreach (var elem in Statistic) { if (elem != null) yield return new ElementValue("statistic", elem); } - foreach (var elem in Certainty) { if (elem != null) yield return new ElementValue("certainty", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3101,7 +2809,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3204,7 +2912,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs b/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs index 0bd861e8bb..1f3cd524c3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EvidenceReport.cs @@ -207,29 +207,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -245,7 +223,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -261,7 +239,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Characteristic?.Any() == true) yield return new KeyValuePair("characteristic",Characteristic); @@ -410,33 +388,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (ExcludeElement != null) yield return ExcludeElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -458,7 +410,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -480,7 +432,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -601,29 +553,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -639,7 +569,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -655,7 +585,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -821,33 +751,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (DisplayElement != null) yield return DisplayElement; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -869,7 +773,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -891,7 +795,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); @@ -1202,49 +1106,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Focus != null) yield return Focus; - if (FocusReference != null) yield return FocusReference; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Text != null) yield return Text; - if (ModeElement != null) yield return ModeElement; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in EntryClassifier) { if (elem != null) yield return elem; } - foreach (var elem in EntryReference) { if (elem != null) yield return elem; } - foreach (var elem in EntryQuantity) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Focus != null) yield return new ElementValue("focus", Focus); - if (FocusReference != null) yield return new ElementValue("focusReference", FocusReference); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Text != null) yield return new ElementValue("text", Text); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in EntryClassifier) { if (elem != null) yield return new ElementValue("entryClassifier", elem); } - foreach (var elem in EntryReference) { if (elem != null) yield return new ElementValue("entryReference", elem); } - foreach (var elem in EntryQuantity) { if (elem != null) yield return new ElementValue("entryQuantity", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1290,7 +1152,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1336,7 +1198,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1758,61 +1620,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in RelatedIdentifier) { if (elem != null) yield return elem; } - if (CiteAs != null) yield return CiteAs; - if (Type != null) yield return Type; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in RelatedIdentifier) { if (elem != null) yield return new ElementValue("relatedIdentifier", elem); } - if (CiteAs != null) yield return new ElementValue("citeAs", CiteAs); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1876,7 +1684,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1940,7 +1748,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs b/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs index 19291b108f..1287981779 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/EvidenceVariable.cs @@ -490,53 +490,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (ExcludeElement != null) yield return ExcludeElement; - if (DefinitionReference != null) yield return DefinitionReference; - if (DefinitionCanonicalElement != null) yield return DefinitionCanonicalElement; - if (DefinitionCodeableConcept != null) yield return DefinitionCodeableConcept; - if (DefinitionExpression != null) yield return DefinitionExpression; - if (DefinitionIdElement != null) yield return DefinitionIdElement; - if (DefinitionByTypeAndValue != null) yield return DefinitionByTypeAndValue; - if (DefinitionByCombination != null) yield return DefinitionByCombination; - if (Instances != null) yield return Instances; - if (Duration != null) yield return Duration; - foreach (var elem in TimeFromEvent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (DefinitionReference != null) yield return new ElementValue("definitionReference", DefinitionReference); - if (DefinitionCanonicalElement != null) yield return new ElementValue("definitionCanonical", DefinitionCanonicalElement); - if (DefinitionCodeableConcept != null) yield return new ElementValue("definitionCodeableConcept", DefinitionCodeableConcept); - if (DefinitionExpression != null) yield return new ElementValue("definitionExpression", DefinitionExpression); - if (DefinitionIdElement != null) yield return new ElementValue("definitionId", DefinitionIdElement); - if (DefinitionByTypeAndValue != null) yield return new ElementValue("definitionByTypeAndValue", DefinitionByTypeAndValue); - if (DefinitionByCombination != null) yield return new ElementValue("definitionByCombination", DefinitionByCombination); - if (Instances != null) yield return new ElementValue("instances", Instances); - if (Duration != null) yield return new ElementValue("duration", Duration); - foreach (var elem in TimeFromEvent) { if (elem != null) yield return new ElementValue("timeFromEvent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -588,7 +542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -640,7 +594,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -806,35 +760,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Method) { if (elem != null) yield return elem; } - if (Device != null) yield return Device; - if (Value != null) yield return Value; - if (Offset != null) yield return Offset; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Method) { if (elem != null) yield return new ElementValue("method", elem); } - if (Device != null) yield return new ElementValue("device", Device); - if (Value != null) yield return new ElementValue("value", Value); - if (Offset != null) yield return new ElementValue("offset", Offset); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -859,7 +785,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -884,7 +810,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1039,31 +965,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (ThresholdElement != null) yield return ThresholdElement; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (ThresholdElement != null) yield return new ElementValue("threshold", ThresholdElement); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1082,7 +984,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1101,7 +1003,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1265,35 +1167,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Event != null) yield return Event; - if (Quantity != null) yield return Quantity; - if (Range != null) yield return Range; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Event != null) yield return new ElementValue("event", Event); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Range != null) yield return new ElementValue("range", Range); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1318,7 +1192,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1343,7 +1217,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1459,29 +1333,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1497,7 +1349,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1513,7 +1365,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2367,85 +2219,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (ShortTitleElement != null) yield return ShortTitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (ActualElement != null) yield return ActualElement; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - if (HandlingElement != null) yield return HandlingElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ShortTitleElement != null) yield return new ElementValue("shortTitle", ShortTitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - if (HandlingElement != null) yield return new ElementValue("handling", HandlingElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2545,7 +2319,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2645,7 +2419,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs b/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs index 6ce5ac6d92..9e2c3df922 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ExampleScenario.cs @@ -252,33 +252,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KeyElement != null) yield return KeyElement; - if (TypeElement != null) yield return TypeElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KeyElement != null) yield return new ElementValue("key", KeyElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -300,7 +274,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -322,7 +296,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KeyElement is not null) yield return new KeyValuePair("key",KeyElement); @@ -612,43 +586,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KeyElement != null) yield return KeyElement; - if (StructureType != null) yield return StructureType; - if (StructureVersionElement != null) yield return StructureVersionElement; - if (StructureProfile != null) yield return StructureProfile; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Content != null) yield return Content; - foreach (var elem in Version) { if (elem != null) yield return elem; } - foreach (var elem in ContainedInstance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KeyElement != null) yield return new ElementValue("key", KeyElement); - if (StructureType != null) yield return new ElementValue("structureType", StructureType); - if (StructureVersionElement != null) yield return new ElementValue("structureVersion", StructureVersionElement); - if (StructureProfile != null) yield return new ElementValue("structureProfile", StructureProfile); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Content != null) yield return new ElementValue("content", Content); - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - foreach (var elem in ContainedInstance) { if (elem != null) yield return new ElementValue("containedInstance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -685,7 +623,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -722,7 +660,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KeyElement is not null) yield return new KeyValuePair("key",KeyElement); @@ -914,33 +852,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KeyElement != null) yield return KeyElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KeyElement != null) yield return new ElementValue("key", KeyElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -962,7 +874,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -984,7 +896,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KeyElement is not null) yield return new KeyValuePair("key",KeyElement); @@ -1119,29 +1031,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (InstanceReferenceElement != null) yield return InstanceReferenceElement; - if (VersionReferenceElement != null) yield return VersionReferenceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (InstanceReferenceElement != null) yield return new ElementValue("instanceReference", InstanceReferenceElement); - if (VersionReferenceElement != null) yield return new ElementValue("versionReference", VersionReferenceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1157,7 +1047,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1173,7 +1063,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (InstanceReferenceElement is not null) yield return new KeyValuePair("instanceReference",InstanceReferenceElement); @@ -1392,35 +1282,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (PreConditionsElement != null) yield return PreConditionsElement; - if (PostConditionsElement != null) yield return PostConditionsElement; - foreach (var elem in Step) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PreConditionsElement != null) yield return new ElementValue("preConditions", PreConditionsElement); - if (PostConditionsElement != null) yield return new ElementValue("postConditions", PostConditionsElement); - foreach (var elem in Step) { if (elem != null) yield return new ElementValue("step", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1445,7 +1307,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1470,7 +1332,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1688,37 +1550,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (Process != null) yield return Process; - if (WorkflowElement != null) yield return WorkflowElement; - if (Operation != null) yield return Operation; - foreach (var elem in Alternative) { if (elem != null) yield return elem; } - if (PauseElement != null) yield return PauseElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (Process != null) yield return new ElementValue("process", Process); - if (WorkflowElement != null) yield return new ElementValue("workflow", WorkflowElement); - if (Operation != null) yield return new ElementValue("operation", Operation); - foreach (var elem in Alternative) { if (elem != null) yield return new ElementValue("alternative", elem); } - if (PauseElement != null) yield return new ElementValue("pause", PauseElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1746,7 +1578,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1774,7 +1606,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -2095,43 +1927,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (TitleElement != null) yield return TitleElement; - if (InitiatorElement != null) yield return InitiatorElement; - if (ReceiverElement != null) yield return ReceiverElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (InitiatorActiveElement != null) yield return InitiatorActiveElement; - if (ReceiverActiveElement != null) yield return ReceiverActiveElement; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (InitiatorElement != null) yield return new ElementValue("initiator", InitiatorElement); - if (ReceiverElement != null) yield return new ElementValue("receiver", ReceiverElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (InitiatorActiveElement != null) yield return new ElementValue("initiatorActive", InitiatorActiveElement); - if (ReceiverActiveElement != null) yield return new ElementValue("receiverActive", ReceiverActiveElement); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2168,7 +1964,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2205,7 +2001,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2362,31 +2158,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Step) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Step) { if (elem != null) yield return new ElementValue("step", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2405,7 +2177,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2424,7 +2196,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -3024,65 +2796,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Process) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Process) { if (elem != null) yield return new ElementValue("process", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3152,7 +2866,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3222,7 +2936,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs index 335ac4cf54..f86ba6012f 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ExplanationOfBenefit.cs @@ -200,31 +200,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Claim != null) yield return Claim; - if (Relationship != null) yield return Relationship; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Claim != null) yield return new ElementValue("claim", Claim); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -243,7 +219,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -262,7 +238,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Claim is not null) yield return new KeyValuePair("claim",Claim); @@ -364,29 +340,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (When != null) yield return When; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (When != null) yield return new ElementValue("when", When); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -402,7 +356,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -418,7 +372,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -518,29 +472,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -556,7 +488,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -572,7 +504,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -758,35 +690,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Provider != null) yield return Provider; - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Role != null) yield return Role; - if (Specialty != null) yield return Specialty; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Role != null) yield return new ElementValue("role", Role); - if (Specialty != null) yield return new ElementValue("specialty", Specialty); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -811,7 +715,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -836,7 +740,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1028,37 +932,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Timing != null) yield return Timing; - if (Value != null) yield return Value; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Value != null) yield return new ElementValue("value", Value); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1086,7 +960,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1114,7 +988,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1273,33 +1147,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Diagnosis != null) yield return Diagnosis; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (OnAdmission != null) yield return OnAdmission; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (OnAdmission != null) yield return new ElementValue("onAdmission", OnAdmission); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1321,7 +1169,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1343,7 +1191,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1536,35 +1384,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (Procedure != null) yield return Procedure; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1589,7 +1409,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1614,7 +1434,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1771,31 +1591,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1814,7 +1610,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1833,7 +1629,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FocalElement is not null) yield return new KeyValuePair("focal",FocalElement); @@ -1968,31 +1764,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Type != null) yield return Type; - if (Location != null) yield return Location; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Location != null) yield return new ElementValue("location", Location); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2011,7 +1783,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2030,7 +1802,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -2702,81 +2474,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Request) { if (elem != null) yield return elem; } - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (PatientPaid != null) yield return PatientPaid; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in CareTeamSequenceElement) { if (elem != null) yield return new ElementValue("careTeamSequence", elem); } - foreach (var elem in DiagnosisSequenceElement) { if (elem != null) yield return new ElementValue("diagnosisSequence", elem); } - foreach (var elem in ProcedureSequenceElement) { if (elem != null) yield return new ElementValue("procedureSequence", elem); } - foreach (var elem in InformationSequenceElement) { if (elem != null) yield return new ElementValue("informationSequence", elem); } - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2870,7 +2568,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2964,7 +2662,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3090,29 +2788,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Site) { if (elem != null) yield return elem; } - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3128,7 +2804,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3144,7 +2820,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Site?.Any() == true) yield return new KeyValuePair("site",Site); @@ -3293,33 +2969,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Decision != null) yield return Decision; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (PreAuthRefElement != null) yield return PreAuthRefElement; - if (PreAuthPeriod != null) yield return PreAuthPeriod; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Decision != null) yield return new ElementValue("decision", Decision); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (PreAuthRefElement != null) yield return new ElementValue("preAuthRef", PreAuthRefElement); - if (PreAuthPeriod != null) yield return new ElementValue("preAuthPeriod", PreAuthPeriod); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3341,7 +2991,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3363,7 +3013,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Decision is not null) yield return new KeyValuePair("decision",Decision); @@ -3496,33 +3146,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Reason != null) yield return Reason; - if (Amount != null) yield return Amount; - if (Quantity != null) yield return Quantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3544,7 +3168,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3566,7 +3190,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -4006,63 +3630,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (PatientPaid != null) yield return PatientPaid; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4129,7 +3697,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4196,7 +3764,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4634,61 +4202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (PatientPaid != null) yield return PatientPaid; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4752,7 +4266,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4816,7 +4330,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -5397,73 +4911,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in SubDetailSequenceElement) { if (elem != null) yield return elem; } - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - foreach (var elem in Provider) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Request) { if (elem != null) yield return elem; } - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (PatientPaid != null) yield return PatientPaid; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ItemSequenceElement) { if (elem != null) yield return new ElementValue("itemSequence", elem); } - foreach (var elem in DetailSequenceElement) { if (elem != null) yield return new ElementValue("detailSequence", elem); } - foreach (var elem in SubDetailSequenceElement) { if (elem != null) yield return new ElementValue("subDetailSequence", elem); } - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - foreach (var elem in Provider) { if (elem != null) yield return new ElementValue("provider", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5545,7 +4993,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5627,7 +5075,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ItemSequenceElement?.Any() == true) yield return new KeyValuePair("itemSequence",ItemSequenceElement); @@ -5749,29 +5197,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Site) { if (elem != null) yield return elem; } - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5787,7 +5213,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5803,7 +5229,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Site?.Any() == true) yield return new KeyValuePair("site",Site); @@ -6152,55 +5578,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (PatientPaid != null) yield return PatientPaid; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6255,7 +5633,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6310,7 +5688,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TraceNumber?.Any() == true) yield return new KeyValuePair("traceNumber",TraceNumber); @@ -6655,53 +6033,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (ProductOrService != null) yield return ProductOrService; - if (ProductOrServiceEnd != null) yield return ProductOrServiceEnd; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (PatientPaid != null) yield return PatientPaid; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Tax != null) yield return Tax; - if (Net != null) yield return Net; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - if (ReviewOutcome != null) yield return ReviewOutcome; - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (ProductOrService != null) yield return new ElementValue("productOrService", ProductOrService); - if (ProductOrServiceEnd != null) yield return new ElementValue("productOrServiceEnd", ProductOrServiceEnd); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Tax != null) yield return new ElementValue("tax", Tax); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - if (ReviewOutcome != null) yield return new ElementValue("reviewOutcome", ReviewOutcome); - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6753,7 +6085,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6805,7 +6137,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TraceNumber?.Any() == true) yield return new KeyValuePair("traceNumber",TraceNumber); @@ -6917,29 +6249,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6955,7 +6265,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6971,7 +6281,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -7151,37 +6461,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Adjustment != null) yield return Adjustment; - if (AdjustmentReason != null) yield return AdjustmentReason; - if (DateElement != null) yield return DateElement; - if (Amount != null) yield return Amount; - if (Identifier != null) yield return Identifier; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Adjustment != null) yield return new ElementValue("adjustment", Adjustment); - if (AdjustmentReason != null) yield return new ElementValue("adjustmentReason", AdjustmentReason); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -7209,7 +6489,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -7237,7 +6517,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -7407,33 +6687,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (Type != null) yield return Type; - if (TextElement != null) yield return TextElement; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (Type != null) yield return new ElementValue("type", Type); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -7455,7 +6709,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -7477,7 +6731,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -7728,41 +6982,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (ExcludedElement != null) yield return ExcludedElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Network != null) yield return Network; - if (Unit != null) yield return Unit; - if (Term != null) yield return Term; - foreach (var elem in Financial) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (ExcludedElement != null) yield return new ElementValue("excluded", ExcludedElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Network != null) yield return new ElementValue("network", Network); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Term != null) yield return new ElementValue("term", Term); - foreach (var elem in Financial) { if (elem != null) yield return new ElementValue("financial", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -7796,7 +7016,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -7830,7 +7050,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -7954,31 +7174,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Allowed != null) yield return Allowed; - if (Used != null) yield return Used; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Used != null) yield return new ElementValue("used", Used); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -7997,7 +7193,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -8016,7 +7212,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -9037,123 +8233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in TraceNumber) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (BillablePeriod != null) yield return BillablePeriod; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Priority != null) yield return Priority; - if (FundsReserveRequested != null) yield return FundsReserveRequested; - if (FundsReserve != null) yield return FundsReserve; - foreach (var elem in Related) { if (elem != null) yield return elem; } - if (Prescription != null) yield return Prescription; - if (OriginalPrescription != null) yield return OriginalPrescription; - foreach (var elem in Event) { if (elem != null) yield return elem; } - if (Payee != null) yield return Payee; - if (Referral != null) yield return Referral; - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - if (Facility != null) yield return Facility; - if (Claim != null) yield return Claim; - if (ClaimResponse != null) yield return ClaimResponse; - if (OutcomeElement != null) yield return OutcomeElement; - if (Decision != null) yield return Decision; - if (DispositionElement != null) yield return DispositionElement; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - foreach (var elem in PreAuthRefPeriod) { if (elem != null) yield return elem; } - if (DiagnosisRelatedGroup != null) yield return DiagnosisRelatedGroup; - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - if (PrecedenceElement != null) yield return PrecedenceElement; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (Accident != null) yield return Accident; - if (PatientPaid != null) yield return PatientPaid; - foreach (var elem in Item) { if (elem != null) yield return elem; } - foreach (var elem in AddItem) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Total) { if (elem != null) yield return elem; } - if (Payment != null) yield return Payment; - if (FormCode != null) yield return FormCode; - if (Form != null) yield return Form; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - if (BenefitPeriod != null) yield return BenefitPeriod; - foreach (var elem in BenefitBalance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in TraceNumber) { if (elem != null) yield return new ElementValue("traceNumber", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (BillablePeriod != null) yield return new ElementValue("billablePeriod", BillablePeriod); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (FundsReserveRequested != null) yield return new ElementValue("fundsReserveRequested", FundsReserveRequested); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - if (Prescription != null) yield return new ElementValue("prescription", Prescription); - if (OriginalPrescription != null) yield return new ElementValue("originalPrescription", OriginalPrescription); - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Referral != null) yield return new ElementValue("referral", Referral); - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - if (Facility != null) yield return new ElementValue("facility", Facility); - if (Claim != null) yield return new ElementValue("claim", Claim); - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (Decision != null) yield return new ElementValue("decision", Decision); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - foreach (var elem in PreAuthRefPeriod) { if (elem != null) yield return new ElementValue("preAuthRefPeriod", elem); } - if (DiagnosisRelatedGroup != null) yield return new ElementValue("diagnosisRelatedGroup", DiagnosisRelatedGroup); - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - if (PrecedenceElement != null) yield return new ElementValue("precedence", PrecedenceElement); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (Accident != null) yield return new ElementValue("accident", Accident); - if (PatientPaid != null) yield return new ElementValue("patientPaid", PatientPaid); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - foreach (var elem in AddItem) { if (elem != null) yield return new ElementValue("addItem", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Total) { if (elem != null) yield return new ElementValue("total", elem); } - if (Payment != null) yield return new ElementValue("payment", Payment); - if (FormCode != null) yield return new ElementValue("formCode", FormCode); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - if (BenefitPeriod != null) yield return new ElementValue("benefitPeriod", BenefitPeriod); - foreach (var elem in BenefitBalance) { if (elem != null) yield return new ElementValue("benefitBalance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -9310,7 +8390,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -9467,7 +8547,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Expression.cs b/src/Hl7.Fhir.R5/Model/Generated/Expression.cs index 7c789c6a44..31680d20a5 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Expression.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Expression.cs @@ -269,35 +269,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (NameElement != null) yield return NameElement; - if (LanguageElement != null) yield return LanguageElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (ReferenceElement != null) yield return ReferenceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -322,7 +294,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -347,7 +319,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs b/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs index e74a7d7daf..2228cce21b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ExtendedContactDetail.cs @@ -200,37 +200,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Purpose != null) yield return Purpose; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - if (Organization != null) yield return Organization; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Purpose != null) yield return new ElementValue("purpose", Purpose); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -258,7 +228,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -286,7 +256,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Purpose is not null) yield return new KeyValuePair("purpose",Purpose); diff --git a/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs index 90ea1ad342..0ec468768e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/FamilyMemberHistory.cs @@ -184,29 +184,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -222,7 +200,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -238,7 +216,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -406,35 +384,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Outcome != null) yield return Outcome; - if (ContributedToDeathElement != null) yield return ContributedToDeathElement; - if (Onset != null) yield return Onset; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (ContributedToDeathElement != null) yield return new ElementValue("contributedToDeath", ContributedToDeathElement); - if (Onset != null) yield return new ElementValue("onset", Onset); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -459,7 +409,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -484,7 +434,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -655,35 +605,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Outcome != null) yield return Outcome; - if (ContributedToDeathElement != null) yield return ContributedToDeathElement; - if (Performed != null) yield return Performed; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (ContributedToDeathElement != null) yield return new ElementValue("contributedToDeath", ContributedToDeathElement); - if (Performed != null) yield return new ElementValue("performed", Performed); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -708,7 +630,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -733,7 +655,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1223,63 +1145,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (DataAbsentReason != null) yield return DataAbsentReason; - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (Relationship != null) yield return Relationship; - if (Sex != null) yield return Sex; - if (Born != null) yield return Born; - if (Age != null) yield return Age; - if (EstimatedAgeElement != null) yield return EstimatedAgeElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Sex != null) yield return new ElementValue("sex", Sex); - if (Born != null) yield return new ElementValue("born", Born); - if (Age != null) yield return new ElementValue("age", Age); - if (EstimatedAgeElement != null) yield return new ElementValue("estimatedAge", EstimatedAgeElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1346,7 +1212,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1413,7 +1279,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Flag.cs b/src/Hl7.Fhir.R5/Model/Generated/Flag.cs index b8df1620ab..877bf9a5c5 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Flag.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Flag.cs @@ -289,41 +289,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Period != null) yield return Period; - if (Encounter != null) yield return Encounter; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Period != null) yield return new ElementValue("period", Period); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -357,7 +323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -391,7 +357,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs b/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs index f86a0828bf..7d535a0ec4 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/FormularyItem.cs @@ -198,31 +198,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (StatusElement != null) yield return StatusElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -241,7 +217,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -260,7 +236,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs index ee0994767c..33fd7d4973 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/GenomicStudy.cs @@ -539,61 +539,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in MethodType) { if (elem != null) yield return elem; } - foreach (var elem in ChangeType) { if (elem != null) yield return elem; } - if (GenomeBuild != null) yield return GenomeBuild; - if (InstantiatesCanonicalElement != null) yield return InstantiatesCanonicalElement; - if (InstantiatesUriElement != null) yield return InstantiatesUriElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (ProtocolPerformed != null) yield return ProtocolPerformed; - foreach (var elem in RegionsStudied) { if (elem != null) yield return elem; } - foreach (var elem in RegionsCalled) { if (elem != null) yield return elem; } - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Device) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in MethodType) { if (elem != null) yield return new ElementValue("methodType", elem); } - foreach (var elem in ChangeType) { if (elem != null) yield return new ElementValue("changeType", elem); } - if (GenomeBuild != null) yield return new ElementValue("genomeBuild", GenomeBuild); - if (InstantiatesCanonicalElement != null) yield return new ElementValue("instantiatesCanonical", InstantiatesCanonicalElement); - if (InstantiatesUriElement != null) yield return new ElementValue("instantiatesUri", InstantiatesUriElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (ProtocolPerformed != null) yield return new ElementValue("protocolPerformed", ProtocolPerformed); - foreach (var elem in RegionsStudied) { if (elem != null) yield return new ElementValue("regionsStudied", elem); } - foreach (var elem in RegionsCalled) { if (elem != null) yield return new ElementValue("regionsCalled", elem); } - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -657,7 +603,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -721,7 +667,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -852,31 +798,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (File != null) yield return File; - if (Type != null) yield return Type; - if (GeneratedBy != null) yield return GeneratedBy; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (File != null) yield return new ElementValue("file", File); - if (Type != null) yield return new ElementValue("type", Type); - if (GeneratedBy != null) yield return new ElementValue("generatedBy", GeneratedBy); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -895,7 +817,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -914,7 +836,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (File is not null) yield return new KeyValuePair("file",File); @@ -1011,29 +933,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (File != null) yield return File; - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (File != null) yield return new ElementValue("file", File); - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1049,7 +949,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1065,7 +965,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (File is not null) yield return new KeyValuePair("file",File); @@ -1160,29 +1060,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Actor != null) yield return Actor; - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Actor != null) yield return new ElementValue("actor", Actor); - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1198,7 +1076,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1214,7 +1092,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Actor is not null) yield return new KeyValuePair("actor",Actor); @@ -1309,29 +1187,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Device != null) yield return Device; - if (Function != null) yield return Function; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Device != null) yield return new ElementValue("device", Device); - if (Function != null) yield return new ElementValue("function", Function); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1347,7 +1203,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1363,7 +1219,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Device is not null) yield return new KeyValuePair("device",Device); @@ -1765,55 +1621,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (StartDateElement != null) yield return StartDateElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (Referrer != null) yield return Referrer; - foreach (var elem in Interpreter) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (InstantiatesCanonicalElement != null) yield return InstantiatesCanonicalElement; - if (InstantiatesUriElement != null) yield return InstantiatesUriElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Analysis) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (StartDateElement != null) yield return new ElementValue("startDate", StartDateElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (Referrer != null) yield return new ElementValue("referrer", Referrer); - foreach (var elem in Interpreter) { if (elem != null) yield return new ElementValue("interpreter", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (InstantiatesCanonicalElement != null) yield return new ElementValue("instantiatesCanonical", InstantiatesCanonicalElement); - if (InstantiatesUriElement != null) yield return new ElementValue("instantiatesUri", InstantiatesUriElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Analysis) { if (elem != null) yield return new ElementValue("analysis", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1868,7 +1676,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1923,7 +1731,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Goal.cs b/src/Hl7.Fhir.R5/Model/Generated/Goal.cs index 441647a3a6..2aafd0749e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Goal.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Goal.cs @@ -234,31 +234,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Measure != null) yield return Measure; - if (Detail != null) yield return Detail; - if (Due != null) yield return Due; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Measure != null) yield return new ElementValue("measure", Measure); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (Due != null) yield return new ElementValue("due", Due); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -277,7 +253,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -296,7 +272,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Measure is not null) yield return new KeyValuePair("measure",Measure); @@ -700,57 +676,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (LifecycleStatusElement != null) yield return LifecycleStatusElement; - if (AchievementStatus != null) yield return AchievementStatus; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (ContinuousElement != null) yield return ContinuousElement; - if (Priority != null) yield return Priority; - if (Description != null) yield return Description; - if (Subject != null) yield return Subject; - if (Start != null) yield return Start; - foreach (var elem in Target) { if (elem != null) yield return elem; } - if (StatusDateElement != null) yield return StatusDateElement; - if (StatusReasonElement != null) yield return StatusReasonElement; - if (Source != null) yield return Source; - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Outcome) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (LifecycleStatusElement != null) yield return new ElementValue("lifecycleStatus", LifecycleStatusElement); - if (AchievementStatus != null) yield return new ElementValue("achievementStatus", AchievementStatus); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (ContinuousElement != null) yield return new ElementValue("continuous", ContinuousElement); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Description != null) yield return new ElementValue("description", Description); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Start != null) yield return new ElementValue("start", Start); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (StatusReasonElement != null) yield return new ElementValue("statusReason", StatusReasonElement); - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Outcome) { if (elem != null) yield return new ElementValue("outcome", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -808,7 +734,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -866,7 +792,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs index d3f2e7febc..0e7ee30b28 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/GraphDefinition.cs @@ -307,33 +307,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NodeIdElement != null) yield return NodeIdElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TypeElement != null) yield return TypeElement; - if (ProfileElement != null) yield return ProfileElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NodeIdElement != null) yield return new ElementValue("nodeId", NodeIdElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -355,7 +329,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -377,7 +351,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NodeIdElement is not null) yield return new KeyValuePair("nodeId",NodeIdElement); @@ -731,43 +705,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (SourceIdElement != null) yield return SourceIdElement; - if (PathElement != null) yield return PathElement; - if (SliceNameElement != null) yield return SliceNameElement; - if (TargetIdElement != null) yield return TargetIdElement; - if (ParamsElement != null) yield return ParamsElement; - foreach (var elem in Compartment) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SliceNameElement != null) yield return new ElementValue("sliceName", SliceNameElement); - if (TargetIdElement != null) yield return new ElementValue("targetId", TargetIdElement); - if (ParamsElement != null) yield return new ElementValue("params", ParamsElement); - foreach (var elem in Compartment) { if (elem != null) yield return new ElementValue("compartment", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -804,7 +742,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -841,7 +779,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1088,35 +1026,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (RuleElement != null) yield return RuleElement; - if (CodeElement != null) yield return CodeElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (RuleElement != null) yield return new ElementValue("rule", RuleElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1141,7 +1051,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1166,7 +1076,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); @@ -1787,65 +1697,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (StartElement != null) yield return StartElement; - foreach (var elem in Node) { if (elem != null) yield return elem; } - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (StartElement != null) yield return new ElementValue("start", StartElement); - foreach (var elem in Node) { if (elem != null) yield return new ElementValue("node", elem); } - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1915,7 +1767,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1985,7 +1837,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Group.cs b/src/Hl7.Fhir.R5/Model/Generated/Group.cs index 92addf61ba..1ed578e998 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Group.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Group.cs @@ -297,33 +297,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (ExcludeElement != null) yield return ExcludeElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -345,7 +319,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -367,7 +341,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -502,31 +476,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Entity != null) yield return Entity; - if (Period != null) yield return Period; - if (InactiveElement != null) yield return InactiveElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Entity != null) yield return new ElementValue("entity", Entity); - if (Period != null) yield return new ElementValue("period", Period); - if (InactiveElement != null) yield return new ElementValue("inactive", InactiveElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -545,7 +495,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -564,7 +514,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Entity is not null) yield return new KeyValuePair("entity",Entity); @@ -910,47 +860,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (TypeElement != null) yield return TypeElement; - if (MembershipElement != null) yield return MembershipElement; - if (Code != null) yield return Code; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (QuantityElement != null) yield return QuantityElement; - if (ManagingEntity != null) yield return ManagingEntity; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Member) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (MembershipElement != null) yield return new ElementValue("membership", MembershipElement); - if (Code != null) yield return new ElementValue("code", Code); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (QuantityElement != null) yield return new ElementValue("quantity", QuantityElement); - if (ManagingEntity != null) yield return new ElementValue("managingEntity", ManagingEntity); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Member) { if (elem != null) yield return new ElementValue("member", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -993,7 +903,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1036,7 +946,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs index ca2941b21b..1b481ce2d5 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/GuidanceResponse.cs @@ -430,53 +430,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RequestIdentifier != null) yield return RequestIdentifier; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Module != null) yield return Module; - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (OccurrenceDateTimeElement != null) yield return OccurrenceDateTimeElement; - if (Performer != null) yield return Performer; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (EvaluationMessage != null) yield return EvaluationMessage; - if (OutputParameters != null) yield return OutputParameters; - foreach (var elem in Result) { if (elem != null) yield return elem; } - foreach (var elem in DataRequirement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RequestIdentifier != null) yield return new ElementValue("requestIdentifier", RequestIdentifier); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Module != null) yield return new ElementValue("module", Module); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (OccurrenceDateTimeElement != null) yield return new ElementValue("occurrenceDateTime", OccurrenceDateTimeElement); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (EvaluationMessage != null) yield return new ElementValue("evaluationMessage", EvaluationMessage); - if (OutputParameters != null) yield return new ElementValue("outputParameters", OutputParameters); - foreach (var elem in Result) { if (elem != null) yield return new ElementValue("result", elem); } - foreach (var elem in DataRequirement) { if (elem != null) yield return new ElementValue("dataRequirement", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -528,7 +482,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -580,7 +534,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RequestIdentifier is not null) yield return new KeyValuePair("requestIdentifier",RequestIdentifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs index 4b65a5a40d..1558b69396 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/HealthcareService.cs @@ -162,29 +162,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -200,7 +178,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -216,7 +194,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -758,71 +736,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (ProvidedBy != null) yield return ProvidedBy; - foreach (var elem in OfferedIn) { if (elem != null) yield return elem; } - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (CommentElement != null) yield return CommentElement; - if (ExtraDetailsElement != null) yield return ExtraDetailsElement; - if (Photo != null) yield return Photo; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in ServiceProvisionCode) { if (elem != null) yield return elem; } - foreach (var elem in Eligibility) { if (elem != null) yield return elem; } - foreach (var elem in Program) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - foreach (var elem in ReferralMethod) { if (elem != null) yield return elem; } - if (AppointmentRequiredElement != null) yield return AppointmentRequiredElement; - foreach (var elem in Availability) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (ProvidedBy != null) yield return new ElementValue("providedBy", ProvidedBy); - foreach (var elem in OfferedIn) { if (elem != null) yield return new ElementValue("offeredIn", elem); } - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (ExtraDetailsElement != null) yield return new ElementValue("extraDetails", ExtraDetailsElement); - if (Photo != null) yield return new ElementValue("photo", Photo); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in ServiceProvisionCode) { if (elem != null) yield return new ElementValue("serviceProvisionCode", elem); } - foreach (var elem in Eligibility) { if (elem != null) yield return new ElementValue("eligibility", elem); } - foreach (var elem in Program) { if (elem != null) yield return new ElementValue("program", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - foreach (var elem in ReferralMethod) { if (elem != null) yield return new ElementValue("referralMethod", elem); } - if (AppointmentRequiredElement != null) yield return new ElementValue("appointmentRequired", AppointmentRequiredElement); - foreach (var elem in Availability) { if (elem != null) yield return new ElementValue("availability", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -901,7 +815,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -980,7 +894,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs b/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs index d4c5eeb206..599d62d8c1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/HumanName.cs @@ -376,39 +376,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (TextElement != null) yield return TextElement; - if (FamilyElement != null) yield return FamilyElement; - foreach (var elem in GivenElement) { if (elem != null) yield return elem; } - foreach (var elem in PrefixElement) { if (elem != null) yield return elem; } - foreach (var elem in SuffixElement) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (FamilyElement != null) yield return new ElementValue("family", FamilyElement); - foreach (var elem in GivenElement) { if (elem != null) yield return new ElementValue("given", elem); } - foreach (var elem in PrefixElement) { if (elem != null) yield return new ElementValue("prefix", elem); } - foreach (var elem in SuffixElement) { if (elem != null) yield return new ElementValue("suffix", elem); } - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +407,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -470,7 +438,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs b/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs index c190c1a61b..2f39ce3431 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImagingSelection.cs @@ -263,29 +263,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -301,7 +279,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -317,7 +295,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -536,37 +514,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (NumberElement != null) yield return NumberElement; - if (SopClass != null) yield return SopClass; - foreach (var elem in SubsetElement) { if (elem != null) yield return elem; } - foreach (var elem in ImageRegion2D) { if (elem != null) yield return elem; } - foreach (var elem in ImageRegion3D) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (SopClass != null) yield return new ElementValue("sopClass", SopClass); - foreach (var elem in SubsetElement) { if (elem != null) yield return new ElementValue("subset", elem); } - foreach (var elem in ImageRegion2D) { if (elem != null) yield return new ElementValue("imageRegion2D", elem); } - foreach (var elem in ImageRegion3D) { if (elem != null) yield return new ElementValue("imageRegion3D", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -594,7 +542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -622,7 +570,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -763,29 +711,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RegionTypeElement != null) yield return RegionTypeElement; - foreach (var elem in CoordinateElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RegionTypeElement != null) yield return new ElementValue("regionType", RegionTypeElement); - foreach (var elem in CoordinateElement) { if (elem != null) yield return new ElementValue("coordinate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -801,7 +727,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -817,7 +743,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RegionTypeElement is not null) yield return new KeyValuePair("regionType",RegionTypeElement); @@ -953,29 +879,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RegionTypeElement != null) yield return RegionTypeElement; - foreach (var elem in CoordinateElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RegionTypeElement != null) yield return new ElementValue("regionType", RegionTypeElement); - foreach (var elem in CoordinateElement) { if (elem != null) yield return new ElementValue("coordinate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -991,7 +895,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1007,7 +911,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RegionTypeElement is not null) yield return new KeyValuePair("regionType",RegionTypeElement); @@ -1462,59 +1366,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (StudyUidElement != null) yield return StudyUidElement; - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (SeriesUidElement != null) yield return SeriesUidElement; - if (SeriesNumberElement != null) yield return SeriesNumberElement; - if (FrameOfReferenceUidElement != null) yield return FrameOfReferenceUidElement; - if (BodySite != null) yield return BodySite; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (StudyUidElement != null) yield return new ElementValue("studyUid", StudyUidElement); - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (SeriesUidElement != null) yield return new ElementValue("seriesUid", SeriesUidElement); - if (SeriesNumberElement != null) yield return new ElementValue("seriesNumber", SeriesNumberElement); - if (FrameOfReferenceUidElement != null) yield return new ElementValue("frameOfReferenceUid", FrameOfReferenceUidElement); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1575,7 +1427,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1636,7 +1488,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs index 448345a2a1..ead85dae21 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImagingStudy.cs @@ -449,49 +449,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (NumberElement != null) yield return NumberElement; - if (Modality != null) yield return Modality; - if (DescriptionElement != null) yield return DescriptionElement; - if (NumberOfInstancesElement != null) yield return NumberOfInstancesElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (Laterality != null) yield return Laterality; - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - if (StartedElement != null) yield return StartedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (Modality != null) yield return new ElementValue("modality", Modality); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (NumberOfInstancesElement != null) yield return new ElementValue("numberOfInstances", NumberOfInstancesElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Laterality != null) yield return new ElementValue("laterality", Laterality); - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - if (StartedElement != null) yield return new ElementValue("started", StartedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -537,7 +495,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -583,7 +541,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -694,29 +652,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -732,7 +668,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -748,7 +684,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -933,33 +869,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (SopClass != null) yield return SopClass; - if (NumberElement != null) yield return NumberElement; - if (TitleElement != null) yield return TitleElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (SopClass != null) yield return new ElementValue("sopClass", SopClass); - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -981,7 +891,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1003,7 +913,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -1463,61 +1373,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Modality) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (StartedElement != null) yield return StartedElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (Referrer != null) yield return Referrer; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (NumberOfSeriesElement != null) yield return NumberOfSeriesElement; - if (NumberOfInstancesElement != null) yield return NumberOfInstancesElement; - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Series) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Modality) { if (elem != null) yield return new ElementValue("modality", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (StartedElement != null) yield return new ElementValue("started", StartedElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (Referrer != null) yield return new ElementValue("referrer", Referrer); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (NumberOfSeriesElement != null) yield return new ElementValue("numberOfSeries", NumberOfSeriesElement); - if (NumberOfInstancesElement != null) yield return new ElementValue("numberOfInstances", NumberOfInstancesElement); - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Series) { if (elem != null) yield return new ElementValue("series", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1581,7 +1437,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1645,7 +1501,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs b/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs index 026b8b43ce..24c695f651 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Immunization.cs @@ -178,29 +178,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -216,7 +194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -232,7 +210,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -332,29 +310,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Program != null) yield return Program; - if (ProgramStatus != null) yield return ProgramStatus; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Program != null) yield return new ElementValue("program", Program); - if (ProgramStatus != null) yield return new ElementValue("programStatus", ProgramStatus); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -370,7 +326,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -386,7 +342,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Program is not null) yield return new KeyValuePair("program",Program); @@ -535,31 +491,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Manifestation != null) yield return Manifestation; - if (ReportedElement != null) yield return ReportedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Manifestation != null) yield return new ElementValue("manifestation", Manifestation); - if (ReportedElement != null) yield return new ElementValue("reported", ReportedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -578,7 +510,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -597,7 +529,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -801,35 +733,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SeriesElement != null) yield return SeriesElement; - if (Authority != null) yield return Authority; - foreach (var elem in TargetDisease) { if (elem != null) yield return elem; } - if (DoseNumberElement != null) yield return DoseNumberElement; - if (SeriesDosesElement != null) yield return SeriesDosesElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - foreach (var elem in TargetDisease) { if (elem != null) yield return new ElementValue("targetDisease", elem); } - if (DoseNumberElement != null) yield return new ElementValue("doseNumber", DoseNumberElement); - if (SeriesDosesElement != null) yield return new ElementValue("seriesDoses", SeriesDosesElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -854,7 +758,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -879,7 +783,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SeriesElement is not null) yield return new KeyValuePair("series",SeriesElement); @@ -1506,81 +1410,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (VaccineCode != null) yield return VaccineCode; - if (AdministeredProduct != null) yield return AdministeredProduct; - if (Manufacturer != null) yield return Manufacturer; - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - if (PrimarySourceElement != null) yield return PrimarySourceElement; - if (InformationSource != null) yield return InformationSource; - if (Location != null) yield return Location; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (DoseQuantity != null) yield return DoseQuantity; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (IsSubpotentElement != null) yield return IsSubpotentElement; - foreach (var elem in SubpotentReason) { if (elem != null) yield return elem; } - foreach (var elem in ProgramEligibility) { if (elem != null) yield return elem; } - if (FundingSource != null) yield return FundingSource; - foreach (var elem in Reaction) { if (elem != null) yield return elem; } - foreach (var elem in ProtocolApplied) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (VaccineCode != null) yield return new ElementValue("vaccineCode", VaccineCode); - if (AdministeredProduct != null) yield return new ElementValue("administeredProduct", AdministeredProduct); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (PrimarySourceElement != null) yield return new ElementValue("primarySource", PrimarySourceElement); - if (InformationSource != null) yield return new ElementValue("informationSource", InformationSource); - if (Location != null) yield return new ElementValue("location", Location); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (DoseQuantity != null) yield return new ElementValue("doseQuantity", DoseQuantity); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (IsSubpotentElement != null) yield return new ElementValue("isSubpotent", IsSubpotentElement); - foreach (var elem in SubpotentReason) { if (elem != null) yield return new ElementValue("subpotentReason", elem); } - foreach (var elem in ProgramEligibility) { if (elem != null) yield return new ElementValue("programEligibility", elem); } - if (FundingSource != null) yield return new ElementValue("fundingSource", FundingSource); - foreach (var elem in Reaction) { if (elem != null) yield return new ElementValue("reaction", elem); } - foreach (var elem in ProtocolApplied) { if (elem != null) yield return new ElementValue("protocolApplied", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1674,7 +1504,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1768,7 +1598,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs index 1755a40282..b3eacb6cca 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationEvaluation.cs @@ -456,51 +456,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (Authority != null) yield return Authority; - if (TargetDisease != null) yield return TargetDisease; - if (ImmunizationEvent != null) yield return ImmunizationEvent; - if (DoseStatus != null) yield return DoseStatus; - foreach (var elem in DoseStatusReason) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (SeriesElement != null) yield return SeriesElement; - if (DoseNumberElement != null) yield return DoseNumberElement; - if (SeriesDosesElement != null) yield return SeriesDosesElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - if (TargetDisease != null) yield return new ElementValue("targetDisease", TargetDisease); - if (ImmunizationEvent != null) yield return new ElementValue("immunizationEvent", ImmunizationEvent); - if (DoseStatus != null) yield return new ElementValue("doseStatus", DoseStatus); - foreach (var elem in DoseStatusReason) { if (elem != null) yield return new ElementValue("doseStatusReason", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (DoseNumberElement != null) yield return new ElementValue("doseNumber", DoseNumberElement); - if (SeriesDosesElement != null) yield return new ElementValue("seriesDoses", SeriesDosesElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -549,7 +505,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -598,7 +554,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs index a19fe20850..7dff6884ad 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImmunizationRecommendation.cs @@ -395,49 +395,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in VaccineCode) { if (elem != null) yield return elem; } - foreach (var elem in TargetDisease) { if (elem != null) yield return elem; } - foreach (var elem in ContraindicatedVaccineCode) { if (elem != null) yield return elem; } - if (ForecastStatus != null) yield return ForecastStatus; - foreach (var elem in ForecastReason) { if (elem != null) yield return elem; } - foreach (var elem in DateCriterion) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (SeriesElement != null) yield return SeriesElement; - if (DoseNumberElement != null) yield return DoseNumberElement; - if (SeriesDosesElement != null) yield return SeriesDosesElement; - foreach (var elem in SupportingImmunization) { if (elem != null) yield return elem; } - foreach (var elem in SupportingPatientInformation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in VaccineCode) { if (elem != null) yield return new ElementValue("vaccineCode", elem); } - foreach (var elem in TargetDisease) { if (elem != null) yield return new ElementValue("targetDisease", elem); } - foreach (var elem in ContraindicatedVaccineCode) { if (elem != null) yield return new ElementValue("contraindicatedVaccineCode", elem); } - if (ForecastStatus != null) yield return new ElementValue("forecastStatus", ForecastStatus); - foreach (var elem in ForecastReason) { if (elem != null) yield return new ElementValue("forecastReason", elem); } - foreach (var elem in DateCriterion) { if (elem != null) yield return new ElementValue("dateCriterion", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (DoseNumberElement != null) yield return new ElementValue("doseNumber", DoseNumberElement); - if (SeriesDosesElement != null) yield return new ElementValue("seriesDoses", SeriesDosesElement); - foreach (var elem in SupportingImmunization) { if (elem != null) yield return new ElementValue("supportingImmunization", elem); } - foreach (var elem in SupportingPatientInformation) { if (elem != null) yield return new ElementValue("supportingPatientInformation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -483,7 +441,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -529,7 +487,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (VaccineCode?.Any() == true) yield return new KeyValuePair("vaccineCode",VaccineCode); @@ -656,29 +614,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -694,7 +630,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -710,7 +646,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -866,35 +802,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (Authority != null) yield return Authority; - foreach (var elem in Recommendation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - foreach (var elem in Recommendation) { if (elem != null) yield return new ElementValue("recommendation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -919,7 +827,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -944,7 +852,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs index 8802d4f262..fa6d4e9596 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ImplementationGuide.cs @@ -2371,33 +2371,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UriElement != null) yield return UriElement; - if (PackageIdElement != null) yield return PackageIdElement; - if (VersionElement != null) yield return VersionElement; - if (ReasonElement != null) yield return ReasonElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (PackageIdElement != null) yield return new ElementValue("packageId", PackageIdElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (ReasonElement != null) yield return new ElementValue("reason", ReasonElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2419,7 +2393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2441,7 +2415,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UriElement is not null) yield return new KeyValuePair("uri",UriElement); @@ -2580,29 +2554,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ProfileElement != null) yield return ProfileElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2618,7 +2570,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2634,7 +2586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2783,35 +2735,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Grouping) { if (elem != null) yield return elem; } - foreach (var elem in Resource) { if (elem != null) yield return elem; } - if (Page != null) yield return Page; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in Template) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Grouping) { if (elem != null) yield return new ElementValue("grouping", elem); } - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - if (Page != null) yield return new ElementValue("page", Page); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in Template) { if (elem != null) yield return new ElementValue("template", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2836,7 +2760,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2861,7 +2785,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Grouping?.Any() == true) yield return new KeyValuePair("grouping",Grouping); @@ -2998,29 +2922,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3036,7 +2938,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3052,7 +2954,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -3343,39 +3245,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - foreach (var elem in FhirVersionElement) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (IsExampleElement != null) yield return IsExampleElement; - foreach (var elem in ProfileElement) { if (elem != null) yield return elem; } - if (GroupingIdElement != null) yield return GroupingIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - foreach (var elem in FhirVersionElement) { if (elem != null) yield return new ElementValue("fhirVersion", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (IsExampleElement != null) yield return new ElementValue("isExample", IsExampleElement); - foreach (var elem in ProfileElement) { if (elem != null) yield return new ElementValue("profile", elem); } - if (GroupingIdElement != null) yield return new ElementValue("groupingId", GroupingIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3406,7 +3276,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3437,7 +3307,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -3649,35 +3519,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Source != null) yield return Source; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (GenerationElement != null) yield return GenerationElement; - foreach (var elem in Page) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Source != null) yield return new ElementValue("source", Source); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (GenerationElement != null) yield return new ElementValue("generation", GenerationElement); - foreach (var elem in Page) { if (elem != null) yield return new ElementValue("page", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3702,7 +3544,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3727,7 +3569,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Source is not null) yield return new KeyValuePair("source",Source); @@ -3847,29 +3689,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3885,7 +3705,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3901,7 +3721,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -4066,31 +3886,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (SourceElement != null) yield return SourceElement; - if (ScopeElement != null) yield return ScopeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (ScopeElement != null) yield return new ElementValue("scope", ScopeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4109,7 +3905,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4128,7 +3924,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -4331,35 +4127,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RenderingElement != null) yield return RenderingElement; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - foreach (var elem in Page) { if (elem != null) yield return elem; } - foreach (var elem in ImageElement) { if (elem != null) yield return elem; } - foreach (var elem in OtherElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RenderingElement != null) yield return new ElementValue("rendering", RenderingElement); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - foreach (var elem in Page) { if (elem != null) yield return new ElementValue("page", elem); } - foreach (var elem in ImageElement) { if (elem != null) yield return new ElementValue("image", elem); } - foreach (var elem in OtherElement) { if (elem != null) yield return new ElementValue("other", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4384,7 +4152,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4409,7 +4177,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RenderingElement is not null) yield return new KeyValuePair("rendering",RenderingElement); @@ -4598,33 +4366,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Reference != null) yield return Reference; - if (IsExampleElement != null) yield return IsExampleElement; - foreach (var elem in ProfileElement) { if (elem != null) yield return elem; } - if (RelativePathElement != null) yield return RelativePathElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Reference != null) yield return new ElementValue("reference", Reference); - if (IsExampleElement != null) yield return new ElementValue("isExample", IsExampleElement); - foreach (var elem in ProfileElement) { if (elem != null) yield return new ElementValue("profile", elem); } - if (RelativePathElement != null) yield return new ElementValue("relativePath", RelativePathElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4646,7 +4388,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4668,7 +4410,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reference is not null) yield return new KeyValuePair("reference",Reference); @@ -4838,31 +4580,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in AnchorElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in AnchorElement) { if (elem != null) yield return new ElementValue("anchor", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4881,7 +4599,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4900,7 +4618,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -5625,73 +5343,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (PackageIdElement != null) yield return PackageIdElement; - if (LicenseElement != null) yield return LicenseElement; - foreach (var elem in FhirVersionElement) { if (elem != null) yield return elem; } - foreach (var elem in DependsOn) { if (elem != null) yield return elem; } - foreach (var elem in Global) { if (elem != null) yield return elem; } - if (Definition != null) yield return Definition; - if (Manifest != null) yield return Manifest; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (PackageIdElement != null) yield return new ElementValue("packageId", PackageIdElement); - if (LicenseElement != null) yield return new ElementValue("license", LicenseElement); - foreach (var elem in FhirVersionElement) { if (elem != null) yield return new ElementValue("fhirVersion", elem); } - foreach (var elem in DependsOn) { if (elem != null) yield return new ElementValue("dependsOn", elem); } - foreach (var elem in Global) { if (elem != null) yield return new ElementValue("global", elem); } - if (Definition != null) yield return new ElementValue("definition", Definition); - if (Manifest != null) yield return new ElementValue("manifest", Manifest); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5773,7 +5425,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5855,7 +5507,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs b/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs index a303b1e105..61f7c1b974 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Ingredient.cs @@ -194,29 +194,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RoleElement != null) yield return RoleElement; - if (Manufacturer != null) yield return Manufacturer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RoleElement != null) yield return new ElementValue("role", RoleElement); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -232,7 +210,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -248,7 +226,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RoleElement is not null) yield return new KeyValuePair("role",RoleElement); @@ -344,29 +322,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Strength) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Strength) { if (elem != null) yield return new ElementValue("strength", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -382,7 +338,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -398,7 +354,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -651,41 +607,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Presentation != null) yield return Presentation; - if (TextPresentationElement != null) yield return TextPresentationElement; - if (Concentration != null) yield return Concentration; - if (TextConcentrationElement != null) yield return TextConcentrationElement; - if (Basis != null) yield return Basis; - if (MeasurementPointElement != null) yield return MeasurementPointElement; - foreach (var elem in Country) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceStrength) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Presentation != null) yield return new ElementValue("presentation", Presentation); - if (TextPresentationElement != null) yield return new ElementValue("textPresentation", TextPresentationElement); - if (Concentration != null) yield return new ElementValue("concentration", Concentration); - if (TextConcentrationElement != null) yield return new ElementValue("textConcentration", TextConcentrationElement); - if (Basis != null) yield return new ElementValue("basis", Basis); - if (MeasurementPointElement != null) yield return new ElementValue("measurementPoint", MeasurementPointElement); - foreach (var elem in Country) { if (elem != null) yield return new ElementValue("country", elem); } - foreach (var elem in ReferenceStrength) { if (elem != null) yield return new ElementValue("referenceStrength", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -719,7 +641,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -753,7 +675,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Presentation is not null) yield return new KeyValuePair("presentation",Presentation); @@ -912,33 +834,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - if (Strength != null) yield return Strength; - if (MeasurementPointElement != null) yield return MeasurementPointElement; - foreach (var elem in Country) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - if (Strength != null) yield return new ElementValue("strength", Strength); - if (MeasurementPointElement != null) yield return new ElementValue("measurementPoint", MeasurementPointElement); - foreach (var elem in Country) { if (elem != null) yield return new ElementValue("country", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -960,7 +856,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -982,7 +878,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -1260,45 +1156,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in For) { if (elem != null) yield return elem; } - if (Role != null) yield return Role; - foreach (var elem in Function) { if (elem != null) yield return elem; } - if (Group != null) yield return Group; - if (AllergenicIndicatorElement != null) yield return AllergenicIndicatorElement; - if (CommentElement != null) yield return CommentElement; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - if (Substance != null) yield return Substance; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in For) { if (elem != null) yield return new ElementValue("for", elem); } - if (Role != null) yield return new ElementValue("role", Role); - foreach (var elem in Function) { if (elem != null) yield return new ElementValue("function", elem); } - if (Group != null) yield return new ElementValue("group", Group); - if (AllergenicIndicatorElement != null) yield return new ElementValue("allergenicIndicator", AllergenicIndicatorElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - if (Substance != null) yield return new ElementValue("substance", Substance); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1338,7 +1196,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1378,7 +1236,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs b/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs index 3086a61cf4..22e0eb897f 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/InsurancePlan.cs @@ -192,31 +192,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in Benefit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in Benefit) { if (elem != null) yield return new ElementValue("benefit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -235,7 +211,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -254,7 +230,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -387,31 +363,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (RequirementElement != null) yield return RequirementElement; - foreach (var elem in Limit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (RequirementElement != null) yield return new ElementValue("requirement", RequirementElement); - foreach (var elem in Limit) { if (elem != null) yield return new ElementValue("limit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -430,7 +382,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -449,7 +401,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -546,29 +498,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -584,7 +514,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -600,7 +530,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -769,37 +699,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in GeneralCost) { if (elem != null) yield return elem; } - foreach (var elem in SpecificCost) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in GeneralCost) { if (elem != null) yield return new ElementValue("generalCost", elem); } - foreach (var elem in SpecificCost) { if (elem != null) yield return new ElementValue("specificCost", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -827,7 +727,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -855,7 +755,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1023,33 +923,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (GroupSizeElement != null) yield return GroupSizeElement; - if (Cost != null) yield return Cost; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (GroupSizeElement != null) yield return new ElementValue("groupSize", GroupSizeElement); - if (Cost != null) yield return new ElementValue("cost", Cost); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1071,7 +945,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1093,7 +967,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1193,29 +1067,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - foreach (var elem in Benefit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - foreach (var elem in Benefit) { if (elem != null) yield return new ElementValue("benefit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1231,7 +1083,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1247,7 +1099,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -1345,29 +1197,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Cost) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Cost) { if (elem != null) yield return new ElementValue("cost", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1383,7 +1213,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1399,7 +1229,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1530,33 +1360,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Applicability != null) yield return Applicability; - foreach (var elem in Qualifiers) { if (elem != null) yield return elem; } - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Applicability != null) yield return new ElementValue("applicability", Applicability); - foreach (var elem in Qualifiers) { if (elem != null) yield return new ElementValue("qualifiers", elem); } - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1578,7 +1382,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1600,7 +1404,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1952,53 +1756,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (OwnedBy != null) yield return OwnedBy; - if (AdministeredBy != null) yield return AdministeredBy; - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in Coverage) { if (elem != null) yield return elem; } - foreach (var elem in Plan) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (OwnedBy != null) yield return new ElementValue("ownedBy", OwnedBy); - if (AdministeredBy != null) yield return new ElementValue("administeredBy", AdministeredBy); - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in Coverage) { if (elem != null) yield return new ElementValue("coverage", elem); } - foreach (var elem in Plan) { if (elem != null) yield return new ElementValue("plan", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2050,7 +1808,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2102,7 +1860,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs b/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs index b0249b5666..a79f8266c1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/InventoryItem.cs @@ -235,31 +235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameType != null) yield return NameType; - if (LanguageElement != null) yield return LanguageElement; - if (NameElement != null) yield return NameElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameType != null) yield return new ElementValue("nameType", NameType); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -278,7 +254,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -297,7 +273,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameType is not null) yield return new KeyValuePair("nameType",NameType); @@ -395,29 +371,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Organization != null) yield return Organization; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Organization != null) yield return new ElementValue("organization", Organization); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -433,7 +387,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -449,7 +403,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -583,29 +537,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LanguageElement != null) yield return LanguageElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -621,7 +553,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -637,7 +569,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LanguageElement is not null) yield return new KeyValuePair("language",LanguageElement); @@ -751,31 +683,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AssociationType != null) yield return AssociationType; - if (RelatedItem != null) yield return RelatedItem; - if (Quantity != null) yield return Quantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AssociationType != null) yield return new ElementValue("associationType", AssociationType); - if (RelatedItem != null) yield return new ElementValue("relatedItem", RelatedItem); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -794,7 +702,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -813,7 +721,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AssociationType is not null) yield return new KeyValuePair("associationType",AssociationType); @@ -914,29 +822,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CharacteristicType != null) yield return CharacteristicType; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CharacteristicType != null) yield return new ElementValue("characteristicType", CharacteristicType); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -952,7 +838,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -968,7 +854,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CharacteristicType is not null) yield return new KeyValuePair("characteristicType",CharacteristicType); @@ -1150,35 +1036,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpiryElement != null) yield return ExpiryElement; - if (Subject != null) yield return Subject; - if (Location != null) yield return Location; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpiryElement != null) yield return new ElementValue("expiry", ExpiryElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Location != null) yield return new ElementValue("location", Location); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1203,7 +1061,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1228,7 +1086,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1536,53 +1394,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in ResponsibleOrganization) { if (elem != null) yield return elem; } - if (Description != null) yield return Description; - foreach (var elem in InventoryStatus) { if (elem != null) yield return elem; } - if (BaseUnit != null) yield return BaseUnit; - if (NetContent != null) yield return NetContent; - foreach (var elem in Association) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - if (Instance != null) yield return Instance; - if (ProductReference != null) yield return ProductReference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in ResponsibleOrganization) { if (elem != null) yield return new ElementValue("responsibleOrganization", elem); } - if (Description != null) yield return new ElementValue("description", Description); - foreach (var elem in InventoryStatus) { if (elem != null) yield return new ElementValue("inventoryStatus", elem); } - if (BaseUnit != null) yield return new ElementValue("baseUnit", BaseUnit); - if (NetContent != null) yield return new ElementValue("netContent", NetContent); - foreach (var elem in Association) { if (elem != null) yield return new ElementValue("association", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - if (Instance != null) yield return new ElementValue("instance", Instance); - if (ProductReference != null) yield return new ElementValue("productReference", ProductReference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1634,7 +1446,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1686,7 +1498,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs b/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs index da86476d9c..065c850613 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/InventoryReport.cs @@ -249,33 +249,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Location != null) yield return Location; - if (ItemStatus != null) yield return ItemStatus; - if (CountingDateTimeElement != null) yield return CountingDateTimeElement; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Location != null) yield return new ElementValue("location", Location); - if (ItemStatus != null) yield return new ElementValue("itemStatus", ItemStatus); - if (CountingDateTimeElement != null) yield return new ElementValue("countingDateTime", CountingDateTimeElement); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -297,7 +271,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -319,7 +293,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Location is not null) yield return new KeyValuePair("location",Location); @@ -432,31 +406,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Quantity != null) yield return Quantity; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -475,7 +425,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -494,7 +444,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -771,45 +721,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CountTypeElement != null) yield return CountTypeElement; - if (OperationType != null) yield return OperationType; - if (OperationTypeReason != null) yield return OperationTypeReason; - if (ReportedDateTimeElement != null) yield return ReportedDateTimeElement; - if (Reporter != null) yield return Reporter; - if (ReportingPeriod != null) yield return ReportingPeriod; - foreach (var elem in InventoryListing) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CountTypeElement != null) yield return new ElementValue("countType", CountTypeElement); - if (OperationType != null) yield return new ElementValue("operationType", OperationType); - if (OperationTypeReason != null) yield return new ElementValue("operationTypeReason", OperationTypeReason); - if (ReportedDateTimeElement != null) yield return new ElementValue("reportedDateTime", ReportedDateTimeElement); - if (Reporter != null) yield return new ElementValue("reporter", Reporter); - if (ReportingPeriod != null) yield return new ElementValue("reportingPeriod", ReportingPeriod); - foreach (var elem in InventoryListing) { if (elem != null) yield return new ElementValue("inventoryListing", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -849,7 +761,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -889,7 +801,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs b/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs index 31e5052d41..bb4af5f60d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Invoice.cs @@ -189,29 +189,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -227,7 +205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -243,7 +221,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -396,33 +374,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Serviced != null) yield return Serviced; - if (ChargeItem != null) yield return ChargeItem; - foreach (var elem in PriceComponent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (ChargeItem != null) yield return new ElementValue("chargeItem", ChargeItem); - foreach (var elem in PriceComponent) { if (elem != null) yield return new ElementValue("priceComponent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -444,7 +396,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -466,7 +418,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -914,61 +866,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CancelledReasonElement != null) yield return CancelledReasonElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (Recipient != null) yield return Recipient; - if (DateElement != null) yield return DateElement; - if (CreationElement != null) yield return CreationElement; - if (Period != null) yield return Period; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Issuer != null) yield return Issuer; - if (Account != null) yield return Account; - foreach (var elem in LineItem) { if (elem != null) yield return elem; } - foreach (var elem in TotalPriceComponent) { if (elem != null) yield return elem; } - if (TotalNet != null) yield return TotalNet; - if (TotalGross != null) yield return TotalGross; - if (PaymentTermsElement != null) yield return PaymentTermsElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CancelledReasonElement != null) yield return new ElementValue("cancelledReason", CancelledReasonElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Recipient != null) yield return new ElementValue("recipient", Recipient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (CreationElement != null) yield return new ElementValue("creation", CreationElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Issuer != null) yield return new ElementValue("issuer", Issuer); - if (Account != null) yield return new ElementValue("account", Account); - foreach (var elem in LineItem) { if (elem != null) yield return new ElementValue("lineItem", elem); } - foreach (var elem in TotalPriceComponent) { if (elem != null) yield return new ElementValue("totalPriceComponent", elem); } - if (TotalNet != null) yield return new ElementValue("totalNet", TotalNet); - if (TotalGross != null) yield return new ElementValue("totalGross", TotalGross); - if (PaymentTermsElement != null) yield return new ElementValue("paymentTerms", PaymentTermsElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1032,7 +930,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1096,7 +994,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Library.cs b/src/Hl7.Fhir.R5/Model/Generated/Library.cs index b714fbc386..720dcefc90 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Library.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Library.cs @@ -942,91 +942,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in DataRequirement) { if (elem != null) yield return elem; } - foreach (var elem in Content) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in DataRequirement) { if (elem != null) yield return new ElementValue("dataRequirement", elem); } - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1135,7 +1051,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1244,7 +1160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs b/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs index 30f42fd889..d1d3a9d154 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Linkage.cs @@ -198,29 +198,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -236,7 +214,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -252,7 +230,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -369,31 +347,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActiveElement != null) yield return ActiveElement; - if (Author != null) yield return Author; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -412,7 +366,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -431,7 +385,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActiveElement is not null) yield return new KeyValuePair("active",ActiveElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/List.cs b/src/Hl7.Fhir.R5/Model/Generated/List.cs index 3a22a84f32..6bab0b3417 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/List.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/List.cs @@ -247,33 +247,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Flag != null) yield return Flag; - if (DeletedElement != null) yield return DeletedElement; - if (DateElement != null) yield return DateElement; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Flag != null) yield return new ElementValue("flag", Flag); - if (DeletedElement != null) yield return new ElementValue("deleted", DeletedElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -295,7 +269,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -317,7 +291,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Flag is not null) yield return new KeyValuePair("flag",Flag); @@ -668,51 +642,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ModeElement != null) yield return ModeElement; - if (TitleElement != null) yield return TitleElement; - if (Code != null) yield return Code; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - if (Source != null) yield return Source; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Entry) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Source != null) yield return new ElementValue("source", Source); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -761,7 +691,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -810,7 +740,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Location.cs b/src/Hl7.Fhir.R5/Model/Generated/Location.cs index bcca17ac4a..ac5ea5406d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Location.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Location.cs @@ -269,31 +269,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LongitudeElement != null) yield return LongitudeElement; - if (LatitudeElement != null) yield return LatitudeElement; - if (AltitudeElement != null) yield return AltitudeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LongitudeElement != null) yield return new ElementValue("longitude", LongitudeElement); - if (LatitudeElement != null) yield return new ElementValue("latitude", LatitudeElement); - if (AltitudeElement != null) yield return new ElementValue("altitude", AltitudeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -312,7 +288,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -331,7 +307,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LongitudeElement is not null) yield return new KeyValuePair("longitude",LongitudeElement); @@ -782,61 +758,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (OperationalStatus != null) yield return OperationalStatus; - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (ModeElement != null) yield return ModeElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - if (Form != null) yield return Form; - if (Position != null) yield return Position; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (PartOf != null) yield return PartOf; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in HoursOfOperation) { if (elem != null) yield return elem; } - foreach (var elem in VirtualService) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (OperationalStatus != null) yield return new ElementValue("operationalStatus", OperationalStatus); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Address != null) yield return new ElementValue("address", Address); - if (Form != null) yield return new ElementValue("form", Form); - if (Position != null) yield return new ElementValue("position", Position); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in HoursOfOperation) { if (elem != null) yield return new ElementValue("hoursOfOperation", elem); } - foreach (var elem in VirtualService) { if (elem != null) yield return new ElementValue("virtualService", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -900,7 +822,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -964,7 +886,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs index d8277a2ffd..c711cd7a87 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ManufacturedItemDefinition.cs @@ -145,29 +145,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -183,7 +161,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -199,7 +177,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -362,37 +340,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Function) { if (elem != null) yield return elem; } - foreach (var elem in Amount) { if (elem != null) yield return elem; } - foreach (var elem in Constituent) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Function) { if (elem != null) yield return new ElementValue("function", elem); } - foreach (var elem in Amount) { if (elem != null) yield return new ElementValue("amount", elem); } - foreach (var elem in Constituent) { if (elem != null) yield return new ElementValue("constituent", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -420,7 +368,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -448,7 +396,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -581,33 +529,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Amount) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - foreach (var elem in Function) { if (elem != null) yield return elem; } - foreach (var elem in HasIngredient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Amount) { if (elem != null) yield return new ElementValue("amount", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in Function) { if (elem != null) yield return new ElementValue("function", elem); } - foreach (var elem in HasIngredient) { if (elem != null) yield return new ElementValue("hasIngredient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -629,7 +551,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -651,7 +573,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Amount?.Any() == true) yield return new KeyValuePair("amount",Amount); @@ -914,45 +836,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (NameElement != null) yield return NameElement; - if (ManufacturedDoseForm != null) yield return ManufacturedDoseForm; - if (UnitOfPresentation != null) yield return UnitOfPresentation; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in MarketingStatus) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ManufacturedDoseForm != null) yield return new ElementValue("manufacturedDoseForm", ManufacturedDoseForm); - if (UnitOfPresentation != null) yield return new ElementValue("unitOfPresentation", UnitOfPresentation); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in MarketingStatus) { if (elem != null) yield return new ElementValue("marketingStatus", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -992,7 +876,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1032,7 +916,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs b/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs index 5880ece8ff..fbcc6c3a6b 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MarketingStatus.cs @@ -194,35 +194,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Country != null) yield return Country; - if (Jurisdiction != null) yield return Jurisdiction; - if (Status != null) yield return Status; - if (DateRange != null) yield return DateRange; - if (RestoreDateElement != null) yield return RestoreDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Country != null) yield return new ElementValue("country", Country); - if (Jurisdiction != null) yield return new ElementValue("jurisdiction", Jurisdiction); - if (Status != null) yield return new ElementValue("status", Status); - if (DateRange != null) yield return new ElementValue("dateRange", DateRange); - if (RestoreDateElement != null) yield return new ElementValue("restoreDate", RestoreDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -247,7 +219,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -272,7 +244,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Country is not null) yield return new KeyValuePair("country",Country); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Measure.cs b/src/Hl7.Fhir.R5/Model/Generated/Measure.cs index aaa2c33c57..65a4f855bb 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Measure.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Measure.cs @@ -165,29 +165,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (DefinitionElement != null) yield return DefinitionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -203,7 +181,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -219,7 +197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -596,51 +574,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (BasisElement != null) yield return BasisElement; - if (Scoring != null) yield return Scoring; - if (ScoringUnit != null) yield return ScoringUnit; - if (RateAggregationElement != null) yield return RateAggregationElement; - if (ImprovementNotation != null) yield return ImprovementNotation; - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - foreach (var elem in Population) { if (elem != null) yield return elem; } - foreach (var elem in Stratifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (BasisElement != null) yield return new ElementValue("basis", BasisElement); - if (Scoring != null) yield return new ElementValue("scoring", Scoring); - if (ScoringUnit != null) yield return new ElementValue("scoringUnit", ScoringUnit); - if (RateAggregationElement != null) yield return new ElementValue("rateAggregation", RateAggregationElement); - if (ImprovementNotation != null) yield return new ElementValue("improvementNotation", ImprovementNotation); - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - foreach (var elem in Stratifier) { if (elem != null) yield return new ElementValue("stratifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -689,7 +623,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -738,7 +672,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -983,39 +917,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - if (GroupDefinition != null) yield return GroupDefinition; - if (InputPopulationIdElement != null) yield return InputPopulationIdElement; - if (AggregateMethod != null) yield return AggregateMethod; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - if (GroupDefinition != null) yield return new ElementValue("groupDefinition", GroupDefinition); - if (InputPopulationIdElement != null) yield return new ElementValue("inputPopulationId", InputPopulationIdElement); - if (AggregateMethod != null) yield return new ElementValue("aggregateMethod", AggregateMethod); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1046,7 +948,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1077,7 +979,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1282,37 +1184,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - if (GroupDefinition != null) yield return GroupDefinition; - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - if (GroupDefinition != null) yield return new ElementValue("groupDefinition", GroupDefinition); - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1340,7 +1212,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1368,7 +1240,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1556,35 +1428,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - if (GroupDefinition != null) yield return GroupDefinition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - if (GroupDefinition != null) yield return new ElementValue("groupDefinition", GroupDefinition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1609,7 +1453,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1634,7 +1478,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1822,35 +1666,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - foreach (var elem in Usage) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (Criteria != null) yield return Criteria; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Usage) { if (elem != null) yield return new ElementValue("usage", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Criteria != null) yield return new ElementValue("criteria", Criteria); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1875,7 +1691,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1900,7 +1716,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -3138,115 +2954,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (BasisElement != null) yield return BasisElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - if (DisclaimerElement != null) yield return DisclaimerElement; - if (Scoring != null) yield return Scoring; - if (ScoringUnit != null) yield return ScoringUnit; - if (CompositeScoring != null) yield return CompositeScoring; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (RiskAdjustmentElement != null) yield return RiskAdjustmentElement; - if (RateAggregationElement != null) yield return RateAggregationElement; - if (RationaleElement != null) yield return RationaleElement; - if (ClinicalRecommendationStatementElement != null) yield return ClinicalRecommendationStatementElement; - if (ImprovementNotation != null) yield return ImprovementNotation; - foreach (var elem in Term) { if (elem != null) yield return elem; } - if (GuidanceElement != null) yield return GuidanceElement; - foreach (var elem in Group) { if (elem != null) yield return elem; } - foreach (var elem in SupplementalData) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (BasisElement != null) yield return new ElementValue("basis", BasisElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - if (DisclaimerElement != null) yield return new ElementValue("disclaimer", DisclaimerElement); - if (Scoring != null) yield return new ElementValue("scoring", Scoring); - if (ScoringUnit != null) yield return new ElementValue("scoringUnit", ScoringUnit); - if (CompositeScoring != null) yield return new ElementValue("compositeScoring", CompositeScoring); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (RiskAdjustmentElement != null) yield return new ElementValue("riskAdjustment", RiskAdjustmentElement); - if (RateAggregationElement != null) yield return new ElementValue("rateAggregation", RateAggregationElement); - if (RationaleElement != null) yield return new ElementValue("rationale", RationaleElement); - if (ClinicalRecommendationStatementElement != null) yield return new ElementValue("clinicalRecommendationStatement", ClinicalRecommendationStatementElement); - if (ImprovementNotation != null) yield return new ElementValue("improvementNotation", ImprovementNotation); - foreach (var elem in Term) { if (elem != null) yield return new ElementValue("term", elem); } - if (GuidanceElement != null) yield return new ElementValue("guidance", GuidanceElement); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - foreach (var elem in SupplementalData) { if (elem != null) yield return new ElementValue("supplementalData", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3391,7 +3099,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3536,7 +3244,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs index 1b055bb0d8..230ee3c2d8 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MeasureReport.cs @@ -319,37 +319,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - foreach (var elem in Population) { if (elem != null) yield return elem; } - if (MeasureScore != null) yield return MeasureScore; - foreach (var elem in Stratifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - if (MeasureScore != null) yield return new ElementValue("measureScore", MeasureScore); - foreach (var elem in Stratifier) { if (elem != null) yield return new ElementValue("stratifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -377,7 +347,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -405,7 +375,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -613,37 +583,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - if (CountElement != null) yield return CountElement; - if (SubjectResults != null) yield return SubjectResults; - foreach (var elem in SubjectReport) { if (elem != null) yield return elem; } - if (Subjects != null) yield return Subjects; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (SubjectResults != null) yield return new ElementValue("subjectResults", SubjectResults); - foreach (var elem in SubjectReport) { if (elem != null) yield return new ElementValue("subjectReport", elem); } - if (Subjects != null) yield return new ElementValue("subjects", Subjects); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -671,7 +611,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -699,7 +639,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -835,31 +775,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - foreach (var elem in Stratum) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Stratum) { if (elem != null) yield return new ElementValue("stratum", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -878,7 +794,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -897,7 +813,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1033,33 +949,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - foreach (var elem in Component) { if (elem != null) yield return elem; } - foreach (var elem in Population) { if (elem != null) yield return elem; } - if (MeasureScore != null) yield return MeasureScore; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - if (MeasureScore != null) yield return new ElementValue("measureScore", MeasureScore); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1081,7 +971,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1103,7 +993,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -1241,31 +1131,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1284,7 +1150,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1303,7 +1169,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1508,37 +1374,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (Code != null) yield return Code; - if (CountElement != null) yield return CountElement; - if (SubjectResults != null) yield return SubjectResults; - foreach (var elem in SubjectReport) { if (elem != null) yield return elem; } - if (Subjects != null) yield return Subjects; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (SubjectResults != null) yield return new ElementValue("subjectResults", SubjectResults); - foreach (var elem in SubjectReport) { if (elem != null) yield return new ElementValue("subjectReport", elem); } - if (Subjects != null) yield return new ElementValue("subjects", Subjects); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1566,7 +1402,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1594,7 +1430,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -2039,59 +1875,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (TypeElement != null) yield return TypeElement; - if (DataUpdateTypeElement != null) yield return DataUpdateTypeElement; - if (MeasureElement != null) yield return MeasureElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (Reporter != null) yield return Reporter; - if (ReportingVendor != null) yield return ReportingVendor; - if (Location != null) yield return Location; - if (Period != null) yield return Period; - if (InputParameters != null) yield return InputParameters; - if (Scoring != null) yield return Scoring; - if (ImprovementNotation != null) yield return ImprovementNotation; - foreach (var elem in Group) { if (elem != null) yield return elem; } - foreach (var elem in SupplementalData) { if (elem != null) yield return elem; } - foreach (var elem in EvaluatedResource) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DataUpdateTypeElement != null) yield return new ElementValue("dataUpdateType", DataUpdateTypeElement); - if (MeasureElement != null) yield return new ElementValue("measure", MeasureElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Reporter != null) yield return new ElementValue("reporter", Reporter); - if (ReportingVendor != null) yield return new ElementValue("reportingVendor", ReportingVendor); - if (Location != null) yield return new ElementValue("location", Location); - if (Period != null) yield return new ElementValue("period", Period); - if (InputParameters != null) yield return new ElementValue("inputParameters", InputParameters); - if (Scoring != null) yield return new ElementValue("scoring", Scoring); - if (ImprovementNotation != null) yield return new ElementValue("improvementNotation", ImprovementNotation); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - foreach (var elem in SupplementalData) { if (elem != null) yield return new ElementValue("supplementalData", elem); } - foreach (var elem in EvaluatedResource) { if (elem != null) yield return new ElementValue("evaluatedResource", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2152,7 +1936,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2213,7 +1997,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Medication.cs b/src/Hl7.Fhir.R5/Model/Generated/Medication.cs index 7248b00f03..9d3ea882e6 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Medication.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Medication.cs @@ -214,31 +214,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (IsActiveElement != null) yield return IsActiveElement; - if (Strength != null) yield return Strength; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (IsActiveElement != null) yield return new ElementValue("isActive", IsActiveElement); - if (Strength != null) yield return new ElementValue("strength", Strength); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -257,7 +233,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -276,7 +252,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -409,29 +385,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -447,7 +401,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -463,7 +417,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LotNumberElement is not null) yield return new KeyValuePair("lotNumber",LotNumberElement); @@ -685,43 +639,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (StatusElement != null) yield return StatusElement; - if (MarketingAuthorizationHolder != null) yield return MarketingAuthorizationHolder; - if (DoseForm != null) yield return DoseForm; - if (TotalVolume != null) yield return TotalVolume; - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - if (Batch != null) yield return Batch; - if (Definition != null) yield return Definition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (MarketingAuthorizationHolder != null) yield return new ElementValue("marketingAuthorizationHolder", MarketingAuthorizationHolder); - if (DoseForm != null) yield return new ElementValue("doseForm", DoseForm); - if (TotalVolume != null) yield return new ElementValue("totalVolume", TotalVolume); - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - if (Batch != null) yield return new ElementValue("batch", Batch); - if (Definition != null) yield return new ElementValue("definition", Definition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -758,7 +676,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -795,7 +713,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs index 568ed75011..b1eb427147 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationAdministration.cs @@ -200,29 +200,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -238,7 +216,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -254,7 +232,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -437,37 +415,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TextElement != null) yield return TextElement; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (Method != null) yield return Method; - if (Dose != null) yield return Dose; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (Method != null) yield return new ElementValue("method", Method); - if (Dose != null) yield return new ElementValue("dose", Dose); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -495,7 +443,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -523,7 +471,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TextElement is not null) yield return new KeyValuePair("text",TextElement); @@ -1006,67 +954,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusReason) { if (elem != null) yield return elem; } - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (Occurence != null) yield return Occurence; - if (RecordedElement != null) yield return RecordedElement; - if (IsSubPotentElement != null) yield return IsSubPotentElement; - foreach (var elem in SubPotentReason) { if (elem != null) yield return elem; } - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (Request != null) yield return Request; - foreach (var elem in Device) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Dosage != null) yield return Dosage; - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusReason) { if (elem != null) yield return new ElementValue("statusReason", elem); } - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (Occurence != null) yield return new ElementValue("occurence", Occurence); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (IsSubPotentElement != null) yield return new ElementValue("isSubPotent", IsSubPotentElement); - foreach (var elem in SubPotentReason) { if (elem != null) yield return new ElementValue("subPotentReason", elem); } - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (Request != null) yield return new ElementValue("request", Request); - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Dosage != null) yield return new ElementValue("dosage", Dosage); - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1139,7 +1027,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1212,7 +1100,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs index 170cfbca7b..da4d0c1f3e 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationDispense.cs @@ -214,29 +214,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -252,7 +230,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -268,7 +246,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -420,33 +398,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (WasSubstitutedElement != null) yield return WasSubstitutedElement; - if (Type != null) yield return Type; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (ResponsibleParty != null) yield return ResponsibleParty; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (WasSubstitutedElement != null) yield return new ElementValue("wasSubstituted", WasSubstitutedElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (ResponsibleParty != null) yield return new ElementValue("responsibleParty", ResponsibleParty); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -468,7 +420,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -490,7 +442,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (WasSubstitutedElement is not null) yield return new KeyValuePair("wasSubstituted",WasSubstitutedElement); @@ -1122,79 +1074,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (NotPerformedReason != null) yield return NotPerformedReason; - if (StatusChangedElement != null) yield return StatusChangedElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in AuthorizingPrescription) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - if (DaysSupply != null) yield return DaysSupply; - if (RecordedElement != null) yield return RecordedElement; - if (WhenPreparedElement != null) yield return WhenPreparedElement; - if (WhenHandedOverElement != null) yield return WhenHandedOverElement; - if (Destination != null) yield return Destination; - foreach (var elem in Receiver) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (RenderedDosageInstructionElement != null) yield return RenderedDosageInstructionElement; - foreach (var elem in DosageInstruction) { if (elem != null) yield return elem; } - if (Substitution != null) yield return Substitution; - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (NotPerformedReason != null) yield return new ElementValue("notPerformedReason", NotPerformedReason); - if (StatusChangedElement != null) yield return new ElementValue("statusChanged", StatusChangedElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in AuthorizingPrescription) { if (elem != null) yield return new ElementValue("authorizingPrescription", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (DaysSupply != null) yield return new ElementValue("daysSupply", DaysSupply); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (WhenPreparedElement != null) yield return new ElementValue("whenPrepared", WhenPreparedElement); - if (WhenHandedOverElement != null) yield return new ElementValue("whenHandedOver", WhenHandedOverElement); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Receiver) { if (elem != null) yield return new ElementValue("receiver", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (RenderedDosageInstructionElement != null) yield return new ElementValue("renderedDosageInstruction", RenderedDosageInstructionElement); - foreach (var elem in DosageInstruction) { if (elem != null) yield return new ElementValue("dosageInstruction", elem); } - if (Substitution != null) yield return new ElementValue("substitution", Substitution); - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1285,7 +1165,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1376,7 +1256,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs index 9c6c633ae8..da92834185 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationKnowledge.cs @@ -178,29 +178,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Reference) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Reference) { if (elem != null) yield return new ElementValue("reference", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -216,7 +194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -232,7 +210,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -327,29 +305,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Source != null) yield return Source; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Source != null) yield return new ElementValue("source", Source); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -365,7 +321,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -381,7 +337,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -533,33 +489,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in EffectiveDate) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (SourceElement != null) yield return SourceElement; - if (Cost != null) yield return Cost; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in EffectiveDate) { if (elem != null) yield return new ElementValue("effectiveDate", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (Cost != null) yield return new ElementValue("cost", Cost); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -581,7 +511,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -603,7 +533,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (EffectiveDate?.Any() == true) yield return new KeyValuePair("effectiveDate",EffectiveDate); @@ -719,29 +649,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (NameElement != null) yield return NameElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (NameElement != null) yield return new ElementValue("name", NameElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -757,7 +665,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -773,7 +681,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -871,29 +779,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Indication) { if (elem != null) yield return elem; } - foreach (var elem in DosingGuideline) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Indication) { if (elem != null) yield return new ElementValue("indication", elem); } - foreach (var elem in DosingGuideline) { if (elem != null) yield return new ElementValue("dosingGuideline", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -909,7 +795,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -925,7 +811,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Indication?.Any() == true) yield return new KeyValuePair("indication",Indication); @@ -1055,33 +941,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TreatmentIntent != null) yield return TreatmentIntent; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - if (AdministrationTreatment != null) yield return AdministrationTreatment; - foreach (var elem in PatientCharacteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TreatmentIntent != null) yield return new ElementValue("treatmentIntent", TreatmentIntent); - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - if (AdministrationTreatment != null) yield return new ElementValue("administrationTreatment", AdministrationTreatment); - foreach (var elem in PatientCharacteristic) { if (elem != null) yield return new ElementValue("patientCharacteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1103,7 +963,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1125,7 +985,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TreatmentIntent is not null) yield return new KeyValuePair("treatmentIntent",TreatmentIntent); @@ -1222,29 +1082,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1260,7 +1098,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1276,7 +1114,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1375,29 +1213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1413,7 +1229,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1429,7 +1245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1542,31 +1358,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Source != null) yield return Source; - foreach (var elem in Classification) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1585,7 +1377,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1604,7 +1396,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1704,29 +1496,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Cost) { if (elem != null) yield return elem; } - if (PackagedProduct != null) yield return PackagedProduct; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Cost) { if (elem != null) yield return new ElementValue("cost", elem); } - if (PackagedProduct != null) yield return new ElementValue("packagedProduct", PackagedProduct); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1742,7 +1512,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1758,7 +1528,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Cost?.Any() == true) yield return new KeyValuePair("cost",Cost); @@ -1906,33 +1676,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ReferenceElement != null) yield return ReferenceElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (StabilityDuration != null) yield return StabilityDuration; - foreach (var elem in EnvironmentalSetting) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (StabilityDuration != null) yield return new ElementValue("stabilityDuration", StabilityDuration); - foreach (var elem in EnvironmentalSetting) { if (elem != null) yield return new ElementValue("environmentalSetting", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1954,7 +1698,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1976,7 +1720,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ReferenceElement is not null) yield return new KeyValuePair("reference",ReferenceElement); @@ -2078,29 +1822,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2116,7 +1838,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2132,7 +1854,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2262,33 +1984,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RegulatoryAuthority != null) yield return RegulatoryAuthority; - foreach (var elem in Substitution) { if (elem != null) yield return elem; } - foreach (var elem in Schedule) { if (elem != null) yield return elem; } - if (MaxDispense != null) yield return MaxDispense; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RegulatoryAuthority != null) yield return new ElementValue("regulatoryAuthority", RegulatoryAuthority); - foreach (var elem in Substitution) { if (elem != null) yield return new ElementValue("substitution", elem); } - foreach (var elem in Schedule) { if (elem != null) yield return new ElementValue("schedule", elem); } - if (MaxDispense != null) yield return new ElementValue("maxDispense", MaxDispense); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2310,7 +2006,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2332,7 +2028,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RegulatoryAuthority is not null) yield return new KeyValuePair("regulatoryAuthority",RegulatoryAuthority); @@ -2447,29 +2143,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (AllowedElement != null) yield return AllowedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (AllowedElement != null) yield return new ElementValue("allowed", AllowedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2485,7 +2159,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2501,7 +2175,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2595,29 +2269,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2633,7 +2285,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2649,7 +2301,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -2801,35 +2453,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Definition) { if (elem != null) yield return elem; } - if (DoseForm != null) yield return DoseForm; - foreach (var elem in IntendedRoute) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - foreach (var elem in DrugCharacteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - if (DoseForm != null) yield return new ElementValue("doseForm", DoseForm); - foreach (var elem in IntendedRoute) { if (elem != null) yield return new ElementValue("intendedRoute", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - foreach (var elem in DrugCharacteristic) { if (elem != null) yield return new ElementValue("drugCharacteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2854,7 +2478,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2879,7 +2503,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Definition?.Any() == true) yield return new KeyValuePair("definition",Definition); @@ -2999,31 +2623,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (Type != null) yield return Type; - if (Strength != null) yield return Strength; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (Type != null) yield return new ElementValue("type", Type); - if (Strength != null) yield return new ElementValue("strength", Strength); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3042,7 +2642,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3061,7 +2661,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -3161,29 +2761,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3199,7 +2777,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3215,7 +2793,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -3663,65 +3241,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (StatusElement != null) yield return StatusElement; - if (Author != null) yield return Author; - foreach (var elem in IntendedJurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in NameElement) { if (elem != null) yield return elem; } - foreach (var elem in RelatedMedicationKnowledge) { if (elem != null) yield return elem; } - foreach (var elem in AssociatedMedication) { if (elem != null) yield return elem; } - foreach (var elem in ProductType) { if (elem != null) yield return elem; } - foreach (var elem in Monograph) { if (elem != null) yield return elem; } - if (PreparationInstructionElement != null) yield return PreparationInstructionElement; - foreach (var elem in Cost) { if (elem != null) yield return elem; } - foreach (var elem in MonitoringProgram) { if (elem != null) yield return elem; } - foreach (var elem in IndicationGuideline) { if (elem != null) yield return elem; } - foreach (var elem in MedicineClassification) { if (elem != null) yield return elem; } - foreach (var elem in Packaging) { if (elem != null) yield return elem; } - foreach (var elem in ClinicalUseIssue) { if (elem != null) yield return elem; } - foreach (var elem in StorageGuideline) { if (elem != null) yield return elem; } - foreach (var elem in Regulatory) { if (elem != null) yield return elem; } - if (Definitional != null) yield return Definitional; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in IntendedJurisdiction) { if (elem != null) yield return new ElementValue("intendedJurisdiction", elem); } - foreach (var elem in NameElement) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in RelatedMedicationKnowledge) { if (elem != null) yield return new ElementValue("relatedMedicationKnowledge", elem); } - foreach (var elem in AssociatedMedication) { if (elem != null) yield return new ElementValue("associatedMedication", elem); } - foreach (var elem in ProductType) { if (elem != null) yield return new ElementValue("productType", elem); } - foreach (var elem in Monograph) { if (elem != null) yield return new ElementValue("monograph", elem); } - if (PreparationInstructionElement != null) yield return new ElementValue("preparationInstruction", PreparationInstructionElement); - foreach (var elem in Cost) { if (elem != null) yield return new ElementValue("cost", elem); } - foreach (var elem in MonitoringProgram) { if (elem != null) yield return new ElementValue("monitoringProgram", elem); } - foreach (var elem in IndicationGuideline) { if (elem != null) yield return new ElementValue("indicationGuideline", elem); } - foreach (var elem in MedicineClassification) { if (elem != null) yield return new ElementValue("medicineClassification", elem); } - foreach (var elem in Packaging) { if (elem != null) yield return new ElementValue("packaging", elem); } - foreach (var elem in ClinicalUseIssue) { if (elem != null) yield return new ElementValue("clinicalUseIssue", elem); } - foreach (var elem in StorageGuideline) { if (elem != null) yield return new ElementValue("storageGuideline", elem); } - foreach (var elem in Regulatory) { if (elem != null) yield return new ElementValue("regulatory", elem); } - if (Definitional != null) yield return new ElementValue("definitional", Definitional); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3791,7 +3311,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3861,7 +3381,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs index 9e8253c1f1..6af7487fff 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationRequest.cs @@ -402,43 +402,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (InitialFill != null) yield return InitialFill; - if (DispenseInterval != null) yield return DispenseInterval; - if (ValidityPeriod != null) yield return ValidityPeriod; - if (NumberOfRepeatsAllowedElement != null) yield return NumberOfRepeatsAllowedElement; - if (Quantity != null) yield return Quantity; - if (ExpectedSupplyDuration != null) yield return ExpectedSupplyDuration; - if (Dispenser != null) yield return Dispenser; - foreach (var elem in DispenserInstruction) { if (elem != null) yield return elem; } - if (DoseAdministrationAid != null) yield return DoseAdministrationAid; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (InitialFill != null) yield return new ElementValue("initialFill", InitialFill); - if (DispenseInterval != null) yield return new ElementValue("dispenseInterval", DispenseInterval); - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - if (NumberOfRepeatsAllowedElement != null) yield return new ElementValue("numberOfRepeatsAllowed", NumberOfRepeatsAllowedElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (ExpectedSupplyDuration != null) yield return new ElementValue("expectedSupplyDuration", ExpectedSupplyDuration); - if (Dispenser != null) yield return new ElementValue("dispenser", Dispenser); - foreach (var elem in DispenserInstruction) { if (elem != null) yield return new ElementValue("dispenserInstruction", elem); } - if (DoseAdministrationAid != null) yield return new ElementValue("doseAdministrationAid", DoseAdministrationAid); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -475,7 +439,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -512,7 +476,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (InitialFill is not null) yield return new KeyValuePair("initialFill",InitialFill); @@ -616,29 +580,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Duration != null) yield return Duration; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Duration != null) yield return new ElementValue("duration", Duration); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -654,7 +596,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -670,7 +612,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -771,29 +713,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Allowed != null) yield return Allowed; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -809,7 +729,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -825,7 +745,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Allowed is not null) yield return new KeyValuePair("allowed",Allowed); @@ -1597,91 +1517,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (PriorPrescription != null) yield return PriorPrescription; - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (StatusChangedElement != null) yield return StatusChangedElement; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - foreach (var elem in InformationSource) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (ReportedElement != null) yield return ReportedElement; - if (PerformerType != null) yield return PerformerType; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Device) { if (elem != null) yield return elem; } - if (Recorder != null) yield return Recorder; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (CourseOfTherapyType != null) yield return CourseOfTherapyType; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (RenderedDosageInstructionElement != null) yield return RenderedDosageInstructionElement; - if (EffectiveDosePeriod != null) yield return EffectiveDosePeriod; - foreach (var elem in DosageInstruction) { if (elem != null) yield return elem; } - if (DispenseRequest != null) yield return DispenseRequest; - if (Substitution != null) yield return Substitution; - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (PriorPrescription != null) yield return new ElementValue("priorPrescription", PriorPrescription); - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (StatusChangedElement != null) yield return new ElementValue("statusChanged", StatusChangedElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in InformationSource) { if (elem != null) yield return new ElementValue("informationSource", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (ReportedElement != null) yield return new ElementValue("reported", ReportedElement); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (CourseOfTherapyType != null) yield return new ElementValue("courseOfTherapyType", CourseOfTherapyType); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (RenderedDosageInstructionElement != null) yield return new ElementValue("renderedDosageInstruction", RenderedDosageInstructionElement); - if (EffectiveDosePeriod != null) yield return new ElementValue("effectiveDosePeriod", EffectiveDosePeriod); - foreach (var elem in DosageInstruction) { if (elem != null) yield return new ElementValue("dosageInstruction", elem); } - if (DispenseRequest != null) yield return new ElementValue("dispenseRequest", DispenseRequest); - if (Substitution != null) yield return new ElementValue("substitution", Substitution); - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1790,7 +1626,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1899,7 +1735,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs index c4ec09019b..35443b7f9f 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicationStatement.cs @@ -179,29 +179,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -217,7 +195,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -233,7 +211,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -640,59 +618,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (DateAssertedElement != null) yield return DateAssertedElement; - foreach (var elem in InformationSource) { if (elem != null) yield return elem; } - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelatedClinicalInformation) { if (elem != null) yield return elem; } - if (RenderedDosageInstructionElement != null) yield return RenderedDosageInstructionElement; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - if (Adherence != null) yield return Adherence; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (DateAssertedElement != null) yield return new ElementValue("dateAsserted", DateAssertedElement); - foreach (var elem in InformationSource) { if (elem != null) yield return new ElementValue("informationSource", elem); } - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelatedClinicalInformation) { if (elem != null) yield return new ElementValue("relatedClinicalInformation", elem); } - if (RenderedDosageInstructionElement != null) yield return new ElementValue("renderedDosageInstruction", RenderedDosageInstructionElement); - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - if (Adherence != null) yield return new ElementValue("adherence", Adherence); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -753,7 +679,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -814,7 +740,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs index 286873e849..8b77c940a3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MedicinalProductDefinition.cs @@ -147,29 +147,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Contact != null) yield return Contact; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Contact != null) yield return new ElementValue("contact", Contact); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -185,7 +163,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -201,7 +179,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -348,33 +326,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ProductNameElement != null) yield return ProductNameElement; - if (Type != null) yield return Type; - foreach (var elem in Part) { if (elem != null) yield return elem; } - foreach (var elem in Usage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ProductNameElement != null) yield return new ElementValue("productName", ProductNameElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Part) { if (elem != null) yield return new ElementValue("part", elem); } - foreach (var elem in Usage) { if (elem != null) yield return new ElementValue("usage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -396,7 +348,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -418,7 +370,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ProductNameElement is not null) yield return new KeyValuePair("productName",ProductNameElement); @@ -534,29 +486,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PartElement != null) yield return PartElement; - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PartElement != null) yield return new ElementValue("part", PartElement); - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -572,7 +502,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -588,7 +518,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PartElement is not null) yield return new KeyValuePair("part",PartElement); @@ -705,31 +635,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Country != null) yield return Country; - if (Jurisdiction != null) yield return Jurisdiction; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Country != null) yield return new ElementValue("country", Country); - if (Jurisdiction != null) yield return new ElementValue("jurisdiction", Jurisdiction); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -748,7 +654,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -767,7 +673,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Country is not null) yield return new KeyValuePair("country",Country); @@ -866,29 +772,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Product != null) yield return Product; - if (Type != null) yield return Type; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Product != null) yield return new ElementValue("product", Product); - if (Type != null) yield return new ElementValue("type", Type); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -904,7 +788,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -920,7 +804,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Product is not null) yield return new KeyValuePair("product",Product); @@ -1052,33 +936,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (EffectiveDate != null) yield return EffectiveDate; - foreach (var elem in Organization) { if (elem != null) yield return elem; } - if (ConfidentialityIndicator != null) yield return ConfidentialityIndicator; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (EffectiveDate != null) yield return new ElementValue("effectiveDate", EffectiveDate); - foreach (var elem in Organization) { if (elem != null) yield return new ElementValue("organization", elem); } - if (ConfidentialityIndicator != null) yield return new ElementValue("confidentialityIndicator", ConfidentialityIndicator); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1100,7 +958,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1122,7 +980,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1224,29 +1082,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1262,7 +1098,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1278,7 +1114,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1904,83 +1740,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Domain != null) yield return Domain; - if (VersionElement != null) yield return VersionElement; - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (CombinedPharmaceuticalDoseForm != null) yield return CombinedPharmaceuticalDoseForm; - foreach (var elem in Route) { if (elem != null) yield return elem; } - if (IndicationElement != null) yield return IndicationElement; - if (LegalStatusOfSupply != null) yield return LegalStatusOfSupply; - if (AdditionalMonitoringIndicator != null) yield return AdditionalMonitoringIndicator; - foreach (var elem in SpecialMeasures) { if (elem != null) yield return elem; } - if (PediatricUseIndicator != null) yield return PediatricUseIndicator; - foreach (var elem in Classification) { if (elem != null) yield return elem; } - foreach (var elem in MarketingStatus) { if (elem != null) yield return elem; } - foreach (var elem in PackagedMedicinalProduct) { if (elem != null) yield return elem; } - foreach (var elem in ComprisedOf) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - foreach (var elem in Impurity) { if (elem != null) yield return elem; } - foreach (var elem in AttachedDocument) { if (elem != null) yield return elem; } - foreach (var elem in MasterFile) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in ClinicalTrial) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in CrossReference) { if (elem != null) yield return elem; } - foreach (var elem in Operation) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Domain != null) yield return new ElementValue("domain", Domain); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (CombinedPharmaceuticalDoseForm != null) yield return new ElementValue("combinedPharmaceuticalDoseForm", CombinedPharmaceuticalDoseForm); - foreach (var elem in Route) { if (elem != null) yield return new ElementValue("route", elem); } - if (IndicationElement != null) yield return new ElementValue("indication", IndicationElement); - if (LegalStatusOfSupply != null) yield return new ElementValue("legalStatusOfSupply", LegalStatusOfSupply); - if (AdditionalMonitoringIndicator != null) yield return new ElementValue("additionalMonitoringIndicator", AdditionalMonitoringIndicator); - foreach (var elem in SpecialMeasures) { if (elem != null) yield return new ElementValue("specialMeasures", elem); } - if (PediatricUseIndicator != null) yield return new ElementValue("pediatricUseIndicator", PediatricUseIndicator); - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - foreach (var elem in MarketingStatus) { if (elem != null) yield return new ElementValue("marketingStatus", elem); } - foreach (var elem in PackagedMedicinalProduct) { if (elem != null) yield return new ElementValue("packagedMedicinalProduct", elem); } - foreach (var elem in ComprisedOf) { if (elem != null) yield return new ElementValue("comprisedOf", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - foreach (var elem in Impurity) { if (elem != null) yield return new ElementValue("impurity", elem); } - foreach (var elem in AttachedDocument) { if (elem != null) yield return new ElementValue("attachedDocument", elem); } - foreach (var elem in MasterFile) { if (elem != null) yield return new ElementValue("masterFile", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in ClinicalTrial) { if (elem != null) yield return new ElementValue("clinicalTrial", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in CrossReference) { if (elem != null) yield return new ElementValue("crossReference", elem); } - foreach (var elem in Operation) { if (elem != null) yield return new ElementValue("operation", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2077,7 +1837,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2174,7 +1934,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs index 5ef560d330..7afa045634 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MessageDefinition.cs @@ -317,33 +317,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (ProfileElement != null) yield return ProfileElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -365,7 +339,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -387,7 +361,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -523,29 +497,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MessageElement != null) yield return MessageElement; - if (SituationElement != null) yield return SituationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (SituationElement != null) yield return new ElementValue("situation", SituationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -561,7 +513,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -577,7 +529,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MessageElement is not null) yield return new KeyValuePair("message",MessageElement); @@ -1390,77 +1342,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in ReplacesElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (BaseElement != null) yield return BaseElement; - foreach (var elem in ParentElement) { if (elem != null) yield return elem; } - if (Event != null) yield return Event; - if (CategoryElement != null) yield return CategoryElement; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (ResponseRequiredElement != null) yield return ResponseRequiredElement; - foreach (var elem in AllowedResponse) { if (elem != null) yield return elem; } - if (GraphElement != null) yield return GraphElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in ReplacesElement) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - foreach (var elem in ParentElement) { if (elem != null) yield return new ElementValue("parent", elem); } - if (Event != null) yield return new ElementValue("event", Event); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (ResponseRequiredElement != null) yield return new ElementValue("responseRequired", ResponseRequiredElement); - foreach (var elem in AllowedResponse) { if (elem != null) yield return new ElementValue("allowedResponse", elem); } - if (GraphElement != null) yield return new ElementValue("graph", GraphElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1548,7 +1430,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1636,7 +1518,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs index 9fcf1a2558..b25d18d856 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MessageHeader.cs @@ -232,33 +232,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Endpoint != null) yield return Endpoint; - if (NameElement != null) yield return NameElement; - if (Target != null) yield return Target; - if (Receiver != null) yield return Receiver; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Endpoint != null) yield return new ElementValue("endpoint", Endpoint); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Target != null) yield return new ElementValue("target", Target); - if (Receiver != null) yield return new ElementValue("receiver", Receiver); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -280,7 +254,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -302,7 +276,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Endpoint is not null) yield return new KeyValuePair("endpoint",Endpoint); @@ -505,35 +479,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Endpoint != null) yield return Endpoint; - if (NameElement != null) yield return NameElement; - if (SoftwareElement != null) yield return SoftwareElement; - if (VersionElement != null) yield return VersionElement; - if (Contact != null) yield return Contact; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Endpoint != null) yield return new ElementValue("endpoint", Endpoint); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (SoftwareElement != null) yield return new ElementValue("software", SoftwareElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (Contact != null) yield return new ElementValue("contact", Contact); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -558,7 +504,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -583,7 +529,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Endpoint is not null) yield return new KeyValuePair("endpoint",Endpoint); @@ -722,31 +668,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (CodeElement != null) yield return CodeElement; - if (Details != null) yield return Details; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Details != null) yield return new ElementValue("details", Details); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -765,7 +687,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -784,7 +706,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1027,45 +949,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Event != null) yield return Event; - foreach (var elem in Destination) { if (elem != null) yield return elem; } - if (Sender != null) yield return Sender; - if (Author != null) yield return Author; - if (Source != null) yield return Source; - if (Responsible != null) yield return Responsible; - if (Reason != null) yield return Reason; - if (Response != null) yield return Response; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (DefinitionElement != null) yield return DefinitionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Event != null) yield return new ElementValue("event", Event); - foreach (var elem in Destination) { if (elem != null) yield return new ElementValue("destination", elem); } - if (Sender != null) yield return new ElementValue("sender", Sender); - if (Author != null) yield return new ElementValue("author", Author); - if (Source != null) yield return new ElementValue("source", Source); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Response != null) yield return new ElementValue("response", Response); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1105,7 +989,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1145,7 +1029,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Event is not null) yield return new KeyValuePair("event",Event); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs b/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs index 40da909e00..4e1a152fa2 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MolecularSequence.cs @@ -281,35 +281,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CoordinateSystem != null) yield return CoordinateSystem; - if (OrdinalPositionElement != null) yield return OrdinalPositionElement; - if (SequenceRange != null) yield return SequenceRange; - if (StartingSequence != null) yield return StartingSequence; - foreach (var elem in Edit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CoordinateSystem != null) yield return new ElementValue("coordinateSystem", CoordinateSystem); - if (OrdinalPositionElement != null) yield return new ElementValue("ordinalPosition", OrdinalPositionElement); - if (SequenceRange != null) yield return new ElementValue("sequenceRange", SequenceRange); - if (StartingSequence != null) yield return new ElementValue("startingSequence", StartingSequence); - foreach (var elem in Edit) { if (elem != null) yield return new ElementValue("edit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -334,7 +306,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -359,7 +331,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CoordinateSystem is not null) yield return new KeyValuePair("coordinateSystem",CoordinateSystem); @@ -620,39 +592,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (GenomeAssembly != null) yield return GenomeAssembly; - if (Chromosome != null) yield return Chromosome; - if (Sequence != null) yield return Sequence; - if (WindowStartElement != null) yield return WindowStartElement; - if (WindowEndElement != null) yield return WindowEndElement; - if (OrientationElement != null) yield return OrientationElement; - if (StrandElement != null) yield return StrandElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (GenomeAssembly != null) yield return new ElementValue("genomeAssembly", GenomeAssembly); - if (Chromosome != null) yield return new ElementValue("chromosome", Chromosome); - if (Sequence != null) yield return new ElementValue("sequence", Sequence); - if (WindowStartElement != null) yield return new ElementValue("windowStart", WindowStartElement); - if (WindowEndElement != null) yield return new ElementValue("windowEnd", WindowEndElement); - if (OrientationElement != null) yield return new ElementValue("orientation", OrientationElement); - if (StrandElement != null) yield return new ElementValue("strand", StrandElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -683,7 +623,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -714,7 +654,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (GenomeAssembly is not null) yield return new KeyValuePair("genomeAssembly",GenomeAssembly); @@ -916,33 +856,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (ReplacementSequenceElement != null) yield return ReplacementSequenceElement; - if (ReplacedSequenceElement != null) yield return ReplacedSequenceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (ReplacementSequenceElement != null) yield return new ElementValue("replacementSequence", ReplacementSequenceElement); - if (ReplacedSequenceElement != null) yield return new ElementValue("replacedSequence", ReplacedSequenceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -964,7 +878,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -986,7 +900,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StartElement is not null) yield return new KeyValuePair("start",StartElement); @@ -1250,45 +1164,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (Subject != null) yield return Subject; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (Specimen != null) yield return Specimen; - if (Device != null) yield return Device; - if (Performer != null) yield return Performer; - if (LiteralElement != null) yield return LiteralElement; - foreach (var elem in Formatted) { if (elem != null) yield return elem; } - foreach (var elem in Relative) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (Specimen != null) yield return new ElementValue("specimen", Specimen); - if (Device != null) yield return new ElementValue("device", Device); - if (Performer != null) yield return new ElementValue("performer", Performer); - if (LiteralElement != null) yield return new ElementValue("literal", LiteralElement); - foreach (var elem in Formatted) { if (elem != null) yield return new ElementValue("formatted", elem); } - foreach (var elem in Relative) { if (elem != null) yield return new ElementValue("relative", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1328,7 +1204,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1368,7 +1244,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs b/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs index fbc9e1a62d..858b1aa396 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/MonetaryComponent.cs @@ -245,33 +245,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Code != null) yield return Code; - if (FactorElement != null) yield return FactorElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Code != null) yield return new ElementValue("code", Code); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -293,7 +267,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -315,7 +289,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Money.cs b/src/Hl7.Fhir.R5/Model/Generated/Money.cs index 470d98a40a..12075ddc2a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Money.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Money.cs @@ -165,29 +165,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ValueElement != null) yield return ValueElement; - if (CurrencyElement != null) yield return CurrencyElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (CurrencyElement != null) yield return new ElementValue("currency", CurrencyElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -203,7 +181,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -219,7 +197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ValueElement is not null) yield return new KeyValuePair("value",ValueElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs index caf5978002..c3892ddca7 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/NamingSystem.cs @@ -379,37 +379,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ValueElement != null) yield return ValueElement; - if (PreferredElement != null) yield return PreferredElement; - if (CommentElement != null) yield return CommentElement; - if (Period != null) yield return Period; - if (AuthoritativeElement != null) yield return AuthoritativeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (Period != null) yield return new ElementValue("period", Period); - if (AuthoritativeElement != null) yield return new ElementValue("authoritative", AuthoritativeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -437,7 +407,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -465,7 +435,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1345,87 +1315,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (KindElement != null) yield return KindElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (UsageElement != null) yield return UsageElement; - foreach (var elem in UniqueId) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - foreach (var elem in UniqueId) { if (elem != null) yield return new ElementValue("uniqueId", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1528,7 +1418,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1631,7 +1521,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs index 7073179e53..6807e0bb86 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionIntake.cs @@ -246,39 +246,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (NutritionProduct != null) yield return NutritionProduct; - if (Schedule != null) yield return Schedule; - if (Amount != null) yield return Amount; - if (Rate != null) yield return Rate; - if (NotConsumedElement != null) yield return NotConsumedElement; - if (NotConsumedReason != null) yield return NotConsumedReason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (NutritionProduct != null) yield return new ElementValue("nutritionProduct", NutritionProduct); - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Rate != null) yield return new ElementValue("rate", Rate); - if (NotConsumedElement != null) yield return new ElementValue("notConsumed", NotConsumedElement); - if (NotConsumedReason != null) yield return new ElementValue("notConsumedReason", NotConsumedReason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -309,7 +277,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -340,7 +308,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -445,29 +413,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Nutrient != null) yield return Nutrient; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Nutrient != null) yield return new ElementValue("nutrient", Nutrient); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -483,7 +429,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -499,7 +445,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Nutrient is not null) yield return new KeyValuePair("nutrient",Nutrient); @@ -599,29 +545,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -637,7 +561,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -653,7 +577,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -1131,65 +1055,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusReason) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (RecordedElement != null) yield return RecordedElement; - if (Reported != null) yield return Reported; - foreach (var elem in ConsumedItem) { if (elem != null) yield return elem; } - foreach (var elem in IngredientLabel) { if (elem != null) yield return elem; } - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusReason) { if (elem != null) yield return new ElementValue("statusReason", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (Reported != null) yield return new ElementValue("reported", Reported); - foreach (var elem in ConsumedItem) { if (elem != null) yield return new ElementValue("consumedItem", elem); } - foreach (var elem in IngredientLabel) { if (elem != null) yield return new ElementValue("ingredientLabel", elem); } - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1259,7 +1125,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1329,7 +1195,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs index 97a2ddc3aa..55c11fc429 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionOrder.cs @@ -235,37 +235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Schedule != null) yield return Schedule; - foreach (var elem in Nutrient) { if (elem != null) yield return elem; } - foreach (var elem in Texture) { if (elem != null) yield return elem; } - foreach (var elem in FluidConsistencyType) { if (elem != null) yield return elem; } - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - foreach (var elem in Nutrient) { if (elem != null) yield return new ElementValue("nutrient", elem); } - foreach (var elem in Texture) { if (elem != null) yield return new ElementValue("texture", elem); } - foreach (var elem in FluidConsistencyType) { if (elem != null) yield return new ElementValue("fluidConsistencyType", elem); } - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -293,7 +263,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -321,7 +291,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -457,31 +427,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Timing) { if (elem != null) yield return elem; } - if (AsNeededElement != null) yield return AsNeededElement; - if (AsNeededFor != null) yield return AsNeededFor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Timing) { if (elem != null) yield return new ElementValue("timing", elem); } - if (AsNeededElement != null) yield return new ElementValue("asNeeded", AsNeededElement); - if (AsNeededFor != null) yield return new ElementValue("asNeededFor", AsNeededFor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -500,7 +446,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -519,7 +465,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Timing?.Any() == true) yield return new KeyValuePair("timing",Timing); @@ -617,29 +563,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Modifier != null) yield return Modifier; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Modifier != null) yield return new ElementValue("modifier", Modifier); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -655,7 +579,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -671,7 +595,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Modifier is not null) yield return new KeyValuePair("modifier",Modifier); @@ -769,29 +693,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Modifier != null) yield return Modifier; - if (FoodType != null) yield return FoodType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Modifier != null) yield return new ElementValue("modifier", Modifier); - if (FoodType != null) yield return new ElementValue("foodType", FoodType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -807,7 +709,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -823,7 +725,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Modifier is not null) yield return new KeyValuePair("modifier",Modifier); @@ -1004,35 +906,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ProductNameElement != null) yield return ProductNameElement; - if (Schedule != null) yield return Schedule; - if (Quantity != null) yield return Quantity; - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ProductNameElement != null) yield return new ElementValue("productName", ProductNameElement); - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1057,7 +931,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1082,7 +956,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1217,31 +1091,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Timing) { if (elem != null) yield return elem; } - if (AsNeededElement != null) yield return AsNeededElement; - if (AsNeededFor != null) yield return AsNeededFor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Timing) { if (elem != null) yield return new ElementValue("timing", elem); } - if (AsNeededElement != null) yield return new ElementValue("asNeeded", AsNeededElement); - if (AsNeededFor != null) yield return new ElementValue("asNeededFor", AsNeededFor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1260,7 +1110,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1279,7 +1129,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Timing?.Any() == true) yield return new KeyValuePair("timing",Timing); @@ -1529,43 +1379,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (BaseFormulaType != null) yield return BaseFormulaType; - if (BaseFormulaProductNameElement != null) yield return BaseFormulaProductNameElement; - foreach (var elem in DeliveryDevice) { if (elem != null) yield return elem; } - foreach (var elem in Additive) { if (elem != null) yield return elem; } - if (CaloricDensity != null) yield return CaloricDensity; - if (RouteOfAdministration != null) yield return RouteOfAdministration; - foreach (var elem in Administration) { if (elem != null) yield return elem; } - if (MaxVolumeToDeliver != null) yield return MaxVolumeToDeliver; - if (AdministrationInstructionElement != null) yield return AdministrationInstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (BaseFormulaType != null) yield return new ElementValue("baseFormulaType", BaseFormulaType); - if (BaseFormulaProductNameElement != null) yield return new ElementValue("baseFormulaProductName", BaseFormulaProductNameElement); - foreach (var elem in DeliveryDevice) { if (elem != null) yield return new ElementValue("deliveryDevice", elem); } - foreach (var elem in Additive) { if (elem != null) yield return new ElementValue("additive", elem); } - if (CaloricDensity != null) yield return new ElementValue("caloricDensity", CaloricDensity); - if (RouteOfAdministration != null) yield return new ElementValue("routeOfAdministration", RouteOfAdministration); - foreach (var elem in Administration) { if (elem != null) yield return new ElementValue("administration", elem); } - if (MaxVolumeToDeliver != null) yield return new ElementValue("maxVolumeToDeliver", MaxVolumeToDeliver); - if (AdministrationInstructionElement != null) yield return new ElementValue("administrationInstruction", AdministrationInstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1602,7 +1416,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1639,7 +1453,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (BaseFormulaType is not null) yield return new KeyValuePair("baseFormulaType",BaseFormulaType); @@ -1777,31 +1591,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ProductNameElement != null) yield return ProductNameElement; - if (Quantity != null) yield return Quantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ProductNameElement != null) yield return new ElementValue("productName", ProductNameElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1820,7 +1610,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1839,7 +1629,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1955,31 +1745,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Schedule != null) yield return Schedule; - if (Quantity != null) yield return Quantity; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1998,7 +1764,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2017,7 +1783,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Schedule is not null) yield return new KeyValuePair("schedule",Schedule); @@ -2150,31 +1916,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Timing) { if (elem != null) yield return elem; } - if (AsNeededElement != null) yield return AsNeededElement; - if (AsNeededFor != null) yield return AsNeededFor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Timing) { if (elem != null) yield return new ElementValue("timing", elem); } - if (AsNeededElement != null) yield return new ElementValue("asNeeded", AsNeededElement); - if (AsNeededFor != null) yield return new ElementValue("asNeededFor", AsNeededFor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2193,7 +1935,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2212,7 +1954,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Timing?.Any() == true) yield return new KeyValuePair("timing",Timing); @@ -2811,71 +2553,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (DateTimeElement != null) yield return DateTimeElement; - if (Orderer != null) yield return Orderer; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in AllergyIntolerance) { if (elem != null) yield return elem; } - foreach (var elem in FoodPreferenceModifier) { if (elem != null) yield return elem; } - foreach (var elem in ExcludeFoodModifier) { if (elem != null) yield return elem; } - if (OutsideFoodAllowedElement != null) yield return OutsideFoodAllowedElement; - if (OralDiet != null) yield return OralDiet; - foreach (var elem in Supplement) { if (elem != null) yield return elem; } - if (EnteralFormula != null) yield return EnteralFormula; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in InstantiatesElement) { if (elem != null) yield return new ElementValue("instantiates", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (DateTimeElement != null) yield return new ElementValue("dateTime", DateTimeElement); - if (Orderer != null) yield return new ElementValue("orderer", Orderer); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in AllergyIntolerance) { if (elem != null) yield return new ElementValue("allergyIntolerance", elem); } - foreach (var elem in FoodPreferenceModifier) { if (elem != null) yield return new ElementValue("foodPreferenceModifier", elem); } - foreach (var elem in ExcludeFoodModifier) { if (elem != null) yield return new ElementValue("excludeFoodModifier", elem); } - if (OutsideFoodAllowedElement != null) yield return new ElementValue("outsideFoodAllowed", OutsideFoodAllowedElement); - if (OralDiet != null) yield return new ElementValue("oralDiet", OralDiet); - foreach (var elem in Supplement) { if (elem != null) yield return new ElementValue("supplement", elem); } - if (EnteralFormula != null) yield return new ElementValue("enteralFormula", EnteralFormula); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2954,7 +2632,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3033,7 +2711,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs b/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs index f17d8647e6..b17c07e386 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/NutritionProduct.cs @@ -176,29 +176,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - foreach (var elem in Amount) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - foreach (var elem in Amount) { if (elem != null) yield return new ElementValue("amount", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -214,7 +192,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -230,7 +208,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -325,29 +303,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - foreach (var elem in Amount) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - foreach (var elem in Amount) { if (elem != null) yield return new ElementValue("amount", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -363,7 +319,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -379,7 +335,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -477,29 +433,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -515,7 +449,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -531,7 +465,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -780,39 +714,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpiryElement != null) yield return ExpiryElement; - if (UseByElement != null) yield return UseByElement; - if (BiologicalSourceEvent != null) yield return BiologicalSourceEvent; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpiryElement != null) yield return new ElementValue("expiry", ExpiryElement); - if (UseByElement != null) yield return new ElementValue("useBy", UseByElement); - if (BiologicalSourceEvent != null) yield return new ElementValue("biologicalSourceEvent", BiologicalSourceEvent); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -843,7 +745,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -874,7 +776,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -1121,45 +1023,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in Nutrient) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - foreach (var elem in KnownAllergen) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in Nutrient) { if (elem != null) yield return new ElementValue("nutrient", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - foreach (var elem in KnownAllergen) { if (elem != null) yield return new ElementValue("knownAllergen", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1199,7 +1063,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1239,7 +1103,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Observation.cs b/src/Hl7.Fhir.R5/Model/Generated/Observation.cs index 12e5adb9da..a4b0b92080 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Observation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Observation.cs @@ -233,31 +233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Observation != null) yield return Observation; - if (TypeElement != null) yield return TypeElement; - if (ReasonElement != null) yield return ReasonElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Observation != null) yield return new ElementValue("observation", Observation); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ReasonElement != null) yield return new ElementValue("reason", ReasonElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -276,7 +252,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -295,7 +271,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Observation is not null) yield return new KeyValuePair("observation",Observation); @@ -495,39 +471,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Low != null) yield return Low; - if (High != null) yield return High; - if (NormalValue != null) yield return NormalValue; - if (Type != null) yield return Type; - foreach (var elem in AppliesTo) { if (elem != null) yield return elem; } - if (Age != null) yield return Age; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Low != null) yield return new ElementValue("low", Low); - if (High != null) yield return new ElementValue("high", High); - if (NormalValue != null) yield return new ElementValue("normalValue", NormalValue); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in AppliesTo) { if (elem != null) yield return new ElementValue("appliesTo", elem); } - if (Age != null) yield return new ElementValue("age", Age); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -558,7 +502,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -589,7 +533,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Low is not null) yield return new KeyValuePair("low",Low); @@ -748,35 +692,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (DataAbsentReason != null) yield return DataAbsentReason; - foreach (var elem in Interpretation) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceRange) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - foreach (var elem in Interpretation) { if (elem != null) yield return new ElementValue("interpretation", elem); } - foreach (var elem in ReferenceRange) { if (elem != null) yield return new ElementValue("referenceRange", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -801,7 +717,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -826,7 +742,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1400,79 +1316,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Instantiates != null) yield return Instantiates; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in TriggeredBy) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - if (Effective != null) yield return Effective; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Value != null) yield return Value; - if (DataAbsentReason != null) yield return DataAbsentReason; - foreach (var elem in Interpretation) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (BodyStructure != null) yield return BodyStructure; - if (Method != null) yield return Method; - if (Specimen != null) yield return Specimen; - if (Device != null) yield return Device; - foreach (var elem in ReferenceRange) { if (elem != null) yield return elem; } - foreach (var elem in HasMember) { if (elem != null) yield return elem; } - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Instantiates != null) yield return new ElementValue("instantiates", Instantiates); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in TriggeredBy) { if (elem != null) yield return new ElementValue("triggeredBy", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Value != null) yield return new ElementValue("value", Value); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - foreach (var elem in Interpretation) { if (elem != null) yield return new ElementValue("interpretation", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (BodyStructure != null) yield return new ElementValue("bodyStructure", BodyStructure); - if (Method != null) yield return new ElementValue("method", Method); - if (Specimen != null) yield return new ElementValue("specimen", Specimen); - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in ReferenceRange) { if (elem != null) yield return new ElementValue("referenceRange", elem); } - foreach (var elem in HasMember) { if (elem != null) yield return new ElementValue("hasMember", elem); } - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1563,7 +1407,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1654,7 +1498,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs index df7e5eed1d..2bc753eeb3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ObservationDefinition.cs @@ -544,49 +544,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Context != null) yield return Context; - foreach (var elem in AppliesTo) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (Age != null) yield return Age; - if (GestationalAge != null) yield return GestationalAge; - if (ConditionElement != null) yield return ConditionElement; - if (RangeCategoryElement != null) yield return RangeCategoryElement; - if (Range != null) yield return Range; - if (ValidCodedValueSetElement != null) yield return ValidCodedValueSetElement; - if (NormalCodedValueSetElement != null) yield return NormalCodedValueSetElement; - if (AbnormalCodedValueSetElement != null) yield return AbnormalCodedValueSetElement; - if (CriticalCodedValueSetElement != null) yield return CriticalCodedValueSetElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in AppliesTo) { if (elem != null) yield return new ElementValue("appliesTo", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (Age != null) yield return new ElementValue("age", Age); - if (GestationalAge != null) yield return new ElementValue("gestationalAge", GestationalAge); - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - if (RangeCategoryElement != null) yield return new ElementValue("rangeCategory", RangeCategoryElement); - if (Range != null) yield return new ElementValue("range", Range); - if (ValidCodedValueSetElement != null) yield return new ElementValue("validCodedValueSet", ValidCodedValueSetElement); - if (NormalCodedValueSetElement != null) yield return new ElementValue("normalCodedValueSet", NormalCodedValueSetElement); - if (AbnormalCodedValueSetElement != null) yield return new ElementValue("abnormalCodedValueSet", AbnormalCodedValueSetElement); - if (CriticalCodedValueSetElement != null) yield return new ElementValue("criticalCodedValueSet", CriticalCodedValueSetElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -632,7 +590,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -678,7 +636,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Context is not null) yield return new KeyValuePair("context",Context); @@ -842,33 +800,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in PermittedDataTypeElement) { if (elem != null) yield return elem; } - foreach (var elem in PermittedUnit) { if (elem != null) yield return elem; } - foreach (var elem in QualifiedValue) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in PermittedDataTypeElement) { if (elem != null) yield return new ElementValue("permittedDataType", elem); } - foreach (var elem in PermittedUnit) { if (elem != null) yield return new ElementValue("permittedUnit", elem); } - foreach (var elem in QualifiedValue) { if (elem != null) yield return new ElementValue("qualifiedValue", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -890,7 +822,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -912,7 +844,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1932,99 +1864,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in DerivedFromCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return elem; } - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (PerformerType != null) yield return PerformerType; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - foreach (var elem in PermittedDataTypeElement) { if (elem != null) yield return elem; } - if (MultipleResultsAllowedElement != null) yield return MultipleResultsAllowedElement; - if (BodySite != null) yield return BodySite; - if (Method != null) yield return Method; - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - foreach (var elem in Device) { if (elem != null) yield return elem; } - if (PreferredReportNameElement != null) yield return PreferredReportNameElement; - foreach (var elem in PermittedUnit) { if (elem != null) yield return elem; } - foreach (var elem in QualifiedValue) { if (elem != null) yield return elem; } - foreach (var elem in HasMember) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in DerivedFromCanonicalElement) { if (elem != null) yield return new ElementValue("derivedFromCanonical", elem); } - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return new ElementValue("derivedFromUri", elem); } - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in PermittedDataTypeElement) { if (elem != null) yield return new ElementValue("permittedDataType", elem); } - if (MultipleResultsAllowedElement != null) yield return new ElementValue("multipleResultsAllowed", MultipleResultsAllowedElement); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Method != null) yield return new ElementValue("method", Method); - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - if (PreferredReportNameElement != null) yield return new ElementValue("preferredReportName", PreferredReportNameElement); - foreach (var elem in PermittedUnit) { if (elem != null) yield return new ElementValue("permittedUnit", elem); } - foreach (var elem in QualifiedValue) { if (elem != null) yield return new ElementValue("qualifiedValue", elem); } - foreach (var elem in HasMember) { if (elem != null) yield return new ElementValue("hasMember", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2145,7 +1985,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2266,7 +2106,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs index 2353efce2c..5201ea6893 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/OperationDefinition.cs @@ -572,51 +572,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (UseElement != null) yield return UseElement; - foreach (var elem in ScopeElement) { if (elem != null) yield return elem; } - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in AllowedTypeElement) { if (elem != null) yield return elem; } - foreach (var elem in TargetProfileElement) { if (elem != null) yield return elem; } - if (SearchTypeElement != null) yield return SearchTypeElement; - if (Binding != null) yield return Binding; - foreach (var elem in ReferencedFrom) { if (elem != null) yield return elem; } - foreach (var elem in Part) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (UseElement != null) yield return new ElementValue("use", UseElement); - foreach (var elem in ScopeElement) { if (elem != null) yield return new ElementValue("scope", elem); } - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in AllowedTypeElement) { if (elem != null) yield return new ElementValue("allowedType", elem); } - foreach (var elem in TargetProfileElement) { if (elem != null) yield return new ElementValue("targetProfile", elem); } - if (SearchTypeElement != null) yield return new ElementValue("searchType", SearchTypeElement); - if (Binding != null) yield return new ElementValue("binding", Binding); - foreach (var elem in ReferencedFrom) { if (elem != null) yield return new ElementValue("referencedFrom", elem); } - foreach (var elem in Part) { if (elem != null) yield return new ElementValue("part", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -665,7 +621,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -714,7 +670,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -861,29 +817,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StrengthElement != null) yield return StrengthElement; - if (ValueSetElement != null) yield return ValueSetElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StrengthElement != null) yield return new ElementValue("strength", StrengthElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -899,7 +833,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -915,7 +849,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StrengthElement is not null) yield return new KeyValuePair("strength",StrengthElement); @@ -1049,29 +983,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceElement != null) yield return SourceElement; - if (SourceIdElement != null) yield return SourceIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1087,7 +999,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1103,7 +1015,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceElement is not null) yield return new KeyValuePair("source",SourceElement); @@ -1237,29 +1149,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ParameterNameElement) { if (elem != null) yield return elem; } - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ParameterNameElement) { if (elem != null) yield return new ElementValue("parameterName", elem); } - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1275,7 +1165,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1291,7 +1181,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ParameterNameElement?.Any() == true) yield return new KeyValuePair("parameterName",ParameterNameElement); @@ -2258,85 +2148,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (KindElement != null) yield return KindElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (AffectsStateElement != null) yield return AffectsStateElement; - if (CodeElement != null) yield return CodeElement; - if (CommentElement != null) yield return CommentElement; - if (BaseElement != null) yield return BaseElement; - foreach (var elem in ResourceElement) { if (elem != null) yield return elem; } - if (SystemElement != null) yield return SystemElement; - if (TypeElement != null) yield return TypeElement; - if (InstanceElement != null) yield return InstanceElement; - if (InputProfileElement != null) yield return InputProfileElement; - if (OutputProfileElement != null) yield return OutputProfileElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in Overload) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (AffectsStateElement != null) yield return new ElementValue("affectsState", AffectsStateElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - foreach (var elem in ResourceElement) { if (elem != null) yield return new ElementValue("resource", elem); } - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (InstanceElement != null) yield return new ElementValue("instance", InstanceElement); - if (InputProfileElement != null) yield return new ElementValue("inputProfile", InputProfileElement); - if (OutputProfileElement != null) yield return new ElementValue("outputProfile", OutputProfileElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in Overload) { if (elem != null) yield return new ElementValue("overload", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2436,7 +2248,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2536,7 +2348,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Organization.cs b/src/Hl7.Fhir.R5/Model/Generated/Organization.cs index 77e23eb271..618744a523 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Organization.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Organization.cs @@ -184,33 +184,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Period != null) yield return Period; - if (Issuer != null) yield return Issuer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Period != null) yield return new ElementValue("period", Period); - if (Issuer != null) yield return new ElementValue("issuer", Issuer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -232,7 +206,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -254,7 +228,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -549,45 +523,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (PartOf != null) yield return PartOf; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - foreach (var elem in Qualification) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - foreach (var elem in Qualification) { if (elem != null) yield return new ElementValue("qualification", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -627,7 +563,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -667,7 +603,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs b/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs index 0a450ddae9..6cf1b4ed13 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/OrganizationAffiliation.cs @@ -329,49 +329,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Period != null) yield return Period; - if (Organization != null) yield return Organization; - if (ParticipatingOrganization != null) yield return ParticipatingOrganization; - foreach (var elem in Network) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - foreach (var elem in HealthcareService) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (ParticipatingOrganization != null) yield return new ElementValue("participatingOrganization", ParticipatingOrganization); - foreach (var elem in Network) { if (elem != null) yield return new ElementValue("network", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in HealthcareService) { if (elem != null) yield return new ElementValue("healthcareService", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -417,7 +375,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -463,7 +421,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs index b84e4e6ed3..d6298551ca 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PackagedProductDefinition.cs @@ -142,29 +142,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Jurisdiction != null) yield return Jurisdiction; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Jurisdiction != null) yield return new ElementValue("jurisdiction", Jurisdiction); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -180,7 +158,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -196,7 +174,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -485,47 +463,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (ComponentPartElement != null) yield return ComponentPartElement; - if (QuantityElement != null) yield return QuantityElement; - foreach (var elem in Material) { if (elem != null) yield return elem; } - foreach (var elem in AlternateMaterial) { if (elem != null) yield return elem; } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return elem; } - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in ContainedItem) { if (elem != null) yield return elem; } - foreach (var elem in Packaging) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (ComponentPartElement != null) yield return new ElementValue("componentPart", ComponentPartElement); - if (QuantityElement != null) yield return new ElementValue("quantity", QuantityElement); - foreach (var elem in Material) { if (elem != null) yield return new ElementValue("material", elem); } - foreach (var elem in AlternateMaterial) { if (elem != null) yield return new ElementValue("alternateMaterial", elem); } - foreach (var elem in ShelfLifeStorage) { if (elem != null) yield return new ElementValue("shelfLifeStorage", elem); } - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in ContainedItem) { if (elem != null) yield return new ElementValue("containedItem", elem); } - foreach (var elem in Packaging) { if (elem != null) yield return new ElementValue("packaging", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -568,7 +506,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -611,7 +549,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -717,29 +655,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -755,7 +671,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -771,7 +687,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -865,29 +781,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -903,7 +797,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -919,7 +813,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -1297,55 +1191,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - foreach (var elem in PackageFor) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - foreach (var elem in ContainedItemQuantity) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in LegalStatusOfSupply) { if (elem != null) yield return elem; } - foreach (var elem in MarketingStatus) { if (elem != null) yield return elem; } - if (CopackagedIndicatorElement != null) yield return CopackagedIndicatorElement; - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in AttachedDocument) { if (elem != null) yield return elem; } - if (Packaging != null) yield return Packaging; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in PackageFor) { if (elem != null) yield return new ElementValue("packageFor", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - foreach (var elem in ContainedItemQuantity) { if (elem != null) yield return new ElementValue("containedItemQuantity", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in LegalStatusOfSupply) { if (elem != null) yield return new ElementValue("legalStatusOfSupply", elem); } - foreach (var elem in MarketingStatus) { if (elem != null) yield return new ElementValue("marketingStatus", elem); } - if (CopackagedIndicatorElement != null) yield return new ElementValue("copackagedIndicator", CopackagedIndicatorElement); - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in AttachedDocument) { if (elem != null) yield return new ElementValue("attachedDocument", elem); } - if (Packaging != null) yield return new ElementValue("packaging", Packaging); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1400,7 +1246,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1455,7 +1301,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs index eee08e3459..4554021e73 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ParameterDefinition.cs @@ -342,39 +342,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (UseElement != null) yield return UseElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (TypeElement != null) yield return TypeElement; - if (ProfileElement != null) yield return ProfileElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -405,7 +373,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -436,7 +404,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Patient.cs b/src/Hl7.Fhir.R5/Model/Generated/Patient.cs index 1c94108e60..8ed92e1ffb 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Patient.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Patient.cs @@ -285,39 +285,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - if (Name != null) yield return Name; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - if (GenderElement != null) yield return GenderElement; - if (Organization != null) yield return Organization; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - if (Name != null) yield return new ElementValue("name", Name); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -348,7 +316,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -379,7 +347,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Relationship?.Any() == true) yield return new KeyValuePair("relationship",Relationship); @@ -500,29 +468,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (PreferredElement != null) yield return PreferredElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -538,7 +484,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -554,7 +500,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -674,29 +620,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Other != null) yield return Other; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Other != null) yield return new ElementValue("other", Other); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -712,7 +636,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -728,7 +652,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Other is not null) yield return new KeyValuePair("other",Other); @@ -1108,57 +1032,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (MaritalStatus != null) yield return MaritalStatus; - if (MultipleBirth != null) yield return MultipleBirth; - foreach (var elem in Photo) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - foreach (var elem in GeneralPractitioner) { if (elem != null) yield return elem; } - if (ManagingOrganization != null) yield return ManagingOrganization; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (MaritalStatus != null) yield return new ElementValue("maritalStatus", MaritalStatus); - if (MultipleBirth != null) yield return new ElementValue("multipleBirth", MultipleBirth); - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - foreach (var elem in GeneralPractitioner) { if (elem != null) yield return new ElementValue("generalPractitioner", elem); } - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1216,7 +1090,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1274,7 +1148,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs index 995124c7f6..bf8bf0a03d 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PaymentNotice.cs @@ -366,49 +366,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - if (CreatedElement != null) yield return CreatedElement; - if (Reporter != null) yield return Reporter; - if (Payment != null) yield return Payment; - if (PaymentDateElement != null) yield return PaymentDateElement; - if (Payee != null) yield return Payee; - if (Recipient != null) yield return Recipient; - if (Amount != null) yield return Amount; - if (PaymentStatus != null) yield return PaymentStatus; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Reporter != null) yield return new ElementValue("reporter", Reporter); - if (Payment != null) yield return new ElementValue("payment", Payment); - if (PaymentDateElement != null) yield return new ElementValue("paymentDate", PaymentDateElement); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Recipient != null) yield return new ElementValue("recipient", Recipient); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (PaymentStatus != null) yield return new ElementValue("paymentStatus", PaymentStatus); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -454,7 +412,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -500,7 +458,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs index 953416e778..0e7c91113a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PaymentReconciliation.cs @@ -391,51 +391,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Predecessor != null) yield return Predecessor; - if (Target != null) yield return Target; - if (TargetItem != null) yield return TargetItem; - if (Encounter != null) yield return Encounter; - if (Account != null) yield return Account; - if (Type != null) yield return Type; - if (Submitter != null) yield return Submitter; - if (Response != null) yield return Response; - if (DateElement != null) yield return DateElement; - if (Responsible != null) yield return Responsible; - if (Payee != null) yield return Payee; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Predecessor != null) yield return new ElementValue("predecessor", Predecessor); - if (Target != null) yield return new ElementValue("target", Target); - if (TargetItem != null) yield return new ElementValue("targetItem", TargetItem); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Account != null) yield return new ElementValue("account", Account); - if (Type != null) yield return new ElementValue("type", Type); - if (Submitter != null) yield return new ElementValue("submitter", Submitter); - if (Response != null) yield return new ElementValue("response", Response); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -484,7 +440,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -533,7 +489,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -678,29 +634,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -716,7 +650,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -732,7 +666,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1471,83 +1405,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (StatusElement != null) yield return StatusElement; - if (Kind != null) yield return Kind; - if (Period != null) yield return Period; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (IssuerType != null) yield return IssuerType; - if (PaymentIssuer != null) yield return PaymentIssuer; - if (Request != null) yield return Request; - if (Requestor != null) yield return Requestor; - if (OutcomeElement != null) yield return OutcomeElement; - if (DispositionElement != null) yield return DispositionElement; - if (DateElement != null) yield return DateElement; - if (Location != null) yield return Location; - if (Method != null) yield return Method; - if (CardBrandElement != null) yield return CardBrandElement; - if (AccountNumberElement != null) yield return AccountNumberElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (ProcessorElement != null) yield return ProcessorElement; - if (ReferenceNumberElement != null) yield return ReferenceNumberElement; - if (AuthorizationElement != null) yield return AuthorizationElement; - if (TenderedAmount != null) yield return TenderedAmount; - if (ReturnedAmount != null) yield return ReturnedAmount; - if (Amount != null) yield return Amount; - if (PaymentIdentifier != null) yield return PaymentIdentifier; - foreach (var elem in Allocation) { if (elem != null) yield return elem; } - if (FormCode != null) yield return FormCode; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Kind != null) yield return new ElementValue("kind", Kind); - if (Period != null) yield return new ElementValue("period", Period); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (IssuerType != null) yield return new ElementValue("issuerType", IssuerType); - if (PaymentIssuer != null) yield return new ElementValue("paymentIssuer", PaymentIssuer); - if (Request != null) yield return new ElementValue("request", Request); - if (Requestor != null) yield return new ElementValue("requestor", Requestor); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Location != null) yield return new ElementValue("location", Location); - if (Method != null) yield return new ElementValue("method", Method); - if (CardBrandElement != null) yield return new ElementValue("cardBrand", CardBrandElement); - if (AccountNumberElement != null) yield return new ElementValue("accountNumber", AccountNumberElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (ProcessorElement != null) yield return new ElementValue("processor", ProcessorElement); - if (ReferenceNumberElement != null) yield return new ElementValue("referenceNumber", ReferenceNumberElement); - if (AuthorizationElement != null) yield return new ElementValue("authorization", AuthorizationElement); - if (TenderedAmount != null) yield return new ElementValue("tenderedAmount", TenderedAmount); - if (ReturnedAmount != null) yield return new ElementValue("returnedAmount", ReturnedAmount); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (PaymentIdentifier != null) yield return new ElementValue("paymentIdentifier", PaymentIdentifier); - foreach (var elem in Allocation) { if (elem != null) yield return new ElementValue("allocation", elem); } - if (FormCode != null) yield return new ElementValue("formCode", FormCode); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1644,7 +1502,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1741,7 +1599,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Permission.cs b/src/Hl7.Fhir.R5/Model/Generated/Permission.cs index 0e2dcdb70e..89662d52bc 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Permission.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Permission.cs @@ -228,29 +228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Basis) { if (elem != null) yield return elem; } - foreach (var elem in Evidence) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Basis) { if (elem != null) yield return new ElementValue("basis", elem); } - foreach (var elem in Evidence) { if (elem != null) yield return new ElementValue("evidence", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -266,7 +244,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -282,7 +260,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Basis?.Any() == true) yield return new KeyValuePair("basis",Basis); @@ -434,33 +412,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in Data) { if (elem != null) yield return elem; } - foreach (var elem in Activity) { if (elem != null) yield return elem; } - foreach (var elem in Limit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in Data) { if (elem != null) yield return new ElementValue("data", elem); } - foreach (var elem in Activity) { if (elem != null) yield return new ElementValue("activity", elem); } - foreach (var elem in Limit) { if (elem != null) yield return new ElementValue("limit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -482,7 +434,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -504,7 +456,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -637,33 +589,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - foreach (var elem in Security) { if (elem != null) yield return elem; } - foreach (var elem in Period) { if (elem != null) yield return elem; } - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - foreach (var elem in Security) { if (elem != null) yield return new ElementValue("security", elem); } - foreach (var elem in Period) { if (elem != null) yield return new ElementValue("period", elem); } - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -685,7 +611,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -707,7 +633,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Resource?.Any() == true) yield return new KeyValuePair("resource",Resource); @@ -826,29 +752,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MeaningElement != null) yield return MeaningElement; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MeaningElement != null) yield return new ElementValue("meaning", MeaningElement); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -864,7 +768,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -880,7 +784,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MeaningElement is not null) yield return new KeyValuePair("meaning",MeaningElement); @@ -996,31 +900,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in Purpose) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in Purpose) { if (elem != null) yield return new ElementValue("purpose", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1039,7 +919,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1058,7 +938,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Actor?.Any() == true) yield return new KeyValuePair("actor",Actor); @@ -1283,39 +1163,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (Asserter != null) yield return Asserter; - foreach (var elem in DateElement) { if (elem != null) yield return elem; } - if (Validity != null) yield return Validity; - if (Justification != null) yield return Justification; - if (CombiningElement != null) yield return CombiningElement; - foreach (var elem in Rule) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Asserter != null) yield return new ElementValue("asserter", Asserter); - foreach (var elem in DateElement) { if (elem != null) yield return new ElementValue("date", elem); } - if (Validity != null) yield return new ElementValue("validity", Validity); - if (Justification != null) yield return new ElementValue("justification", Justification); - if (CombiningElement != null) yield return new ElementValue("combining", CombiningElement); - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1346,7 +1194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1377,7 +1225,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Person.cs b/src/Hl7.Fhir.R5/Model/Generated/Person.cs index 7b5d3771c5..0f2040e17c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Person.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Person.cs @@ -202,29 +202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (PreferredElement != null) yield return PreferredElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -240,7 +218,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -256,7 +234,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -372,29 +350,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Target != null) yield return Target; - if (AssuranceElement != null) yield return AssuranceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Target != null) yield return new ElementValue("target", Target); - if (AssuranceElement != null) yield return new ElementValue("assurance", AssuranceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -410,7 +366,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -426,7 +382,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target is not null) yield return new KeyValuePair("target",Target); @@ -752,51 +708,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (MaritalStatus != null) yield return MaritalStatus; - foreach (var elem in Photo) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - if (ManagingOrganization != null) yield return ManagingOrganization; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (MaritalStatus != null) yield return new ElementValue("maritalStatus", MaritalStatus); - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -845,7 +757,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -894,7 +806,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs index e81484469f..9159cac7d8 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PlanDefinition.cs @@ -235,39 +235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Description != null) yield return Description; - if (Priority != null) yield return Priority; - if (Start != null) yield return Start; - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Description != null) yield return new ElementValue("description", Description); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Start != null) yield return new ElementValue("start", Start); - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -298,7 +266,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -329,7 +297,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -449,31 +417,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Measure != null) yield return Measure; - if (Detail != null) yield return Detail; - if (Due != null) yield return Due; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Measure != null) yield return new ElementValue("measure", Measure); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (Due != null) yield return new ElementValue("due", Due); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -492,7 +436,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -511,7 +455,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Measure is not null) yield return new KeyValuePair("measure",Measure); @@ -661,31 +605,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Option) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Option) { if (elem != null) yield return new ElementValue("option", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -704,7 +624,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -723,7 +643,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -893,33 +813,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (TypeCanonicalElement != null) yield return TypeCanonicalElement; - if (TypeReference != null) yield return TypeReference; - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TypeCanonicalElement != null) yield return new ElementValue("typeCanonical", TypeCanonicalElement); - if (TypeReference != null) yield return new ElementValue("typeReference", TypeReference); - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -941,7 +835,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -963,7 +857,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1762,83 +1656,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (PrefixElement != null) yield return PrefixElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TextEquivalentElement != null) yield return TextEquivalentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in GoalIdElement) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in Trigger) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - foreach (var elem in RelatedAction) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - if (Location != null) yield return Location; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (GroupingBehaviorElement != null) yield return GroupingBehaviorElement; - if (SelectionBehaviorElement != null) yield return SelectionBehaviorElement; - if (RequiredBehaviorElement != null) yield return RequiredBehaviorElement; - if (PrecheckBehaviorElement != null) yield return PrecheckBehaviorElement; - if (CardinalityBehaviorElement != null) yield return CardinalityBehaviorElement; - if (Definition != null) yield return Definition; - if (TransformElement != null) yield return TransformElement; - foreach (var elem in DynamicValue) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TextEquivalentElement != null) yield return new ElementValue("textEquivalent", TextEquivalentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in GoalIdElement) { if (elem != null) yield return new ElementValue("goalId", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Trigger) { if (elem != null) yield return new ElementValue("trigger", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - foreach (var elem in RelatedAction) { if (elem != null) yield return new ElementValue("relatedAction", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (GroupingBehaviorElement != null) yield return new ElementValue("groupingBehavior", GroupingBehaviorElement); - if (SelectionBehaviorElement != null) yield return new ElementValue("selectionBehavior", SelectionBehaviorElement); - if (RequiredBehaviorElement != null) yield return new ElementValue("requiredBehavior", RequiredBehaviorElement); - if (PrecheckBehaviorElement != null) yield return new ElementValue("precheckBehavior", PrecheckBehaviorElement); - if (CardinalityBehaviorElement != null) yield return new ElementValue("cardinalityBehavior", CardinalityBehaviorElement); - if (Definition != null) yield return new ElementValue("definition", Definition); - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in DynamicValue) { if (elem != null) yield return new ElementValue("dynamicValue", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1935,7 +1753,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2032,7 +1850,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -2177,29 +1995,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2215,7 +2011,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2231,7 +2027,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -2379,31 +2175,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Requirement != null) yield return Requirement; - if (RelatedDataElement != null) yield return RelatedDataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Requirement != null) yield return new ElementValue("requirement", Requirement); - if (RelatedDataElement != null) yield return new ElementValue("relatedData", RelatedDataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2422,7 +2194,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2441,7 +2213,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -2590,31 +2362,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Requirement != null) yield return Requirement; - if (RelatedDataElement != null) yield return RelatedDataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Requirement != null) yield return new ElementValue("requirement", Requirement); - if (RelatedDataElement != null) yield return new ElementValue("relatedData", RelatedDataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2633,7 +2381,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2652,7 +2400,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -2844,33 +2592,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TargetIdElement != null) yield return TargetIdElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (EndRelationshipElement != null) yield return EndRelationshipElement; - if (Offset != null) yield return Offset; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TargetIdElement != null) yield return new ElementValue("targetId", TargetIdElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (EndRelationshipElement != null) yield return new ElementValue("endRelationship", EndRelationshipElement); - if (Offset != null) yield return new ElementValue("offset", Offset); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2892,7 +2614,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2914,7 +2636,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TargetIdElement is not null) yield return new KeyValuePair("targetId",TargetIdElement); @@ -3136,37 +2858,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActorIdElement != null) yield return ActorIdElement; - if (TypeElement != null) yield return TypeElement; - if (TypeCanonicalElement != null) yield return TypeCanonicalElement; - if (TypeReference != null) yield return TypeReference; - if (Role != null) yield return Role; - if (Function != null) yield return Function; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActorIdElement != null) yield return new ElementValue("actorId", ActorIdElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TypeCanonicalElement != null) yield return new ElementValue("typeCanonical", TypeCanonicalElement); - if (TypeReference != null) yield return new ElementValue("typeReference", TypeReference); - if (Role != null) yield return new ElementValue("role", Role); - if (Function != null) yield return new ElementValue("function", Function); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3194,7 +2886,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3222,7 +2914,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActorIdElement is not null) yield return new KeyValuePair("actorId",ActorIdElement); @@ -3341,29 +3033,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3379,7 +3049,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3395,7 +3065,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -4340,95 +4010,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (SubtitleElement != null) yield return SubtitleElement; - if (Type != null) yield return Type; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Editor) { if (elem != null) yield return elem; } - foreach (var elem in Reviewer) { if (elem != null) yield return elem; } - foreach (var elem in Endorser) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in LibraryElement) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - if (AsNeeded != null) yield return AsNeeded; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (SubtitleElement != null) yield return new ElementValue("subtitle", SubtitleElement); - if (Type != null) yield return new ElementValue("type", Type); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Editor) { if (elem != null) yield return new ElementValue("editor", elem); } - foreach (var elem in Reviewer) { if (elem != null) yield return new ElementValue("reviewer", elem); } - foreach (var elem in Endorser) { if (elem != null) yield return new ElementValue("endorser", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in LibraryElement) { if (elem != null) yield return new ElementValue("library", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - if (AsNeeded != null) yield return new ElementValue("asNeeded", AsNeeded); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4543,7 +4125,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4658,7 +4240,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs index 78fcfee3d0..1496c61ec6 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Practitioner.cs @@ -185,33 +185,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Period != null) yield return Period; - if (Issuer != null) yield return Issuer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Period != null) yield return new ElementValue("period", Period); - if (Issuer != null) yield return new ElementValue("issuer", Issuer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -233,7 +207,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -255,7 +229,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -376,29 +350,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (PreferredElement != null) yield return PreferredElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -414,7 +366,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -430,7 +382,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -721,47 +673,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in Address) { if (elem != null) yield return elem; } - foreach (var elem in Photo) { if (elem != null) yield return elem; } - foreach (var elem in Qualification) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - foreach (var elem in Qualification) { if (elem != null) yield return new ElementValue("qualification", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -804,7 +716,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -847,7 +759,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs index 4348f7fd85..319b5c9ee3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/PractitionerRole.cs @@ -366,53 +366,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Period != null) yield return Period; - if (Practitioner != null) yield return Practitioner; - if (Organization != null) yield return Organization; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - foreach (var elem in HealthcareService) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - foreach (var elem in Availability) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Practitioner != null) yield return new ElementValue("practitioner", Practitioner); - if (Organization != null) yield return new ElementValue("organization", Organization); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in HealthcareService) { if (elem != null) yield return new ElementValue("healthcareService", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - foreach (var elem in Availability) { if (elem != null) yield return new ElementValue("availability", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -464,7 +418,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -516,7 +470,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs b/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs index 0915409b08..a420ea1df8 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Procedure.cs @@ -184,33 +184,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -232,7 +206,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -254,7 +228,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -356,29 +330,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Action != null) yield return Action; - if (Manipulated != null) yield return Manipulated; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Action != null) yield return new ElementValue("action", Action); - if (Manipulated != null) yield return new ElementValue("manipulated", Manipulated); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -394,7 +346,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -410,7 +362,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action is not null) yield return new KeyValuePair("action",Action); @@ -1032,81 +984,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Focus != null) yield return Focus; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (RecordedElement != null) yield return RecordedElement; - if (Recorder != null) yield return Recorder; - if (Reported != null) yield return Reported; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (Outcome != null) yield return Outcome; - foreach (var elem in Report) { if (elem != null) yield return elem; } - foreach (var elem in Complication) { if (elem != null) yield return elem; } - foreach (var elem in FollowUp) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in FocalDevice) { if (elem != null) yield return elem; } - foreach (var elem in Used) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Focus != null) yield return new ElementValue("focus", Focus); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - if (Reported != null) yield return new ElementValue("reported", Reported); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - foreach (var elem in Report) { if (elem != null) yield return new ElementValue("report", elem); } - foreach (var elem in Complication) { if (elem != null) yield return new ElementValue("complication", elem); } - foreach (var elem in FollowUp) { if (elem != null) yield return new ElementValue("followUp", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in FocalDevice) { if (elem != null) yield return new ElementValue("focalDevice", elem); } - foreach (var elem in Used) { if (elem != null) yield return new ElementValue("used", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1200,7 +1078,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1294,7 +1172,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs b/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs index c8698349ab..fe88c1cfd9 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ProductShelfLife.cs @@ -146,31 +146,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Period != null) yield return Period; - foreach (var elem in SpecialPrecautionsForStorage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in SpecialPrecautionsForStorage) { if (elem != null) yield return new ElementValue("specialPrecautionsForStorage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -189,7 +165,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -208,7 +184,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs b/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs index 0a3e1f27da..09eaff9870 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Provenance.cs @@ -228,33 +228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Who != null) yield return Who; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Who != null) yield return new ElementValue("who", Who); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -276,7 +250,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -298,7 +272,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -434,31 +408,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RoleElement != null) yield return RoleElement; - if (What != null) yield return What; - foreach (var elem in Agent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RoleElement != null) yield return new ElementValue("role", RoleElement); - if (What != null) yield return new ElementValue("what", What); - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -477,7 +427,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -496,7 +446,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RoleElement is not null) yield return new KeyValuePair("role",RoleElement); @@ -810,51 +760,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Target) { if (elem != null) yield return elem; } - if (Occurred != null) yield return Occurred; - if (RecordedElement != null) yield return RecordedElement; - foreach (var elem in PolicyElement) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in Authorization) { if (elem != null) yield return elem; } - if (Activity != null) yield return Activity; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - foreach (var elem in Agent) { if (elem != null) yield return elem; } - foreach (var elem in Entity) { if (elem != null) yield return elem; } - foreach (var elem in Signature) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - if (Occurred != null) yield return new ElementValue("occurred", Occurred); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - foreach (var elem in PolicyElement) { if (elem != null) yield return new ElementValue("policy", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Authorization) { if (elem != null) yield return new ElementValue("authorization", elem); } - if (Activity != null) yield return new ElementValue("activity", Activity); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - foreach (var elem in Entity) { if (elem != null) yield return new ElementValue("entity", elem); } - foreach (var elem in Signature) { if (elem != null) yield return new ElementValue("signature", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -903,7 +809,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -952,7 +858,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target?.Any() == true) yield return new KeyValuePair("target",Target); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs index 76c6d8385d..0495ff9551 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Questionnaire.cs @@ -883,61 +883,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (DefinitionElement != null) yield return DefinitionElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (PrefixElement != null) yield return PrefixElement; - if (TextElement != null) yield return TextElement; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in EnableWhen) { if (elem != null) yield return elem; } - if (EnableBehaviorElement != null) yield return EnableBehaviorElement; - if (DisabledDisplayElement != null) yield return DisabledDisplayElement; - if (RequiredElement != null) yield return RequiredElement; - if (RepeatsElement != null) yield return RepeatsElement; - if (ReadOnlyElement != null) yield return ReadOnlyElement; - if (MaxLengthElement != null) yield return MaxLengthElement; - if (AnswerConstraintElement != null) yield return AnswerConstraintElement; - if (AnswerValueSetElement != null) yield return AnswerValueSetElement; - foreach (var elem in AnswerOption) { if (elem != null) yield return elem; } - foreach (var elem in Initial) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in EnableWhen) { if (elem != null) yield return new ElementValue("enableWhen", elem); } - if (EnableBehaviorElement != null) yield return new ElementValue("enableBehavior", EnableBehaviorElement); - if (DisabledDisplayElement != null) yield return new ElementValue("disabledDisplay", DisabledDisplayElement); - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (RepeatsElement != null) yield return new ElementValue("repeats", RepeatsElement); - if (ReadOnlyElement != null) yield return new ElementValue("readOnly", ReadOnlyElement); - if (MaxLengthElement != null) yield return new ElementValue("maxLength", MaxLengthElement); - if (AnswerConstraintElement != null) yield return new ElementValue("answerConstraint", AnswerConstraintElement); - if (AnswerValueSetElement != null) yield return new ElementValue("answerValueSet", AnswerValueSetElement); - foreach (var elem in AnswerOption) { if (elem != null) yield return new ElementValue("answerOption", elem); } - foreach (var elem in Initial) { if (elem != null) yield return new ElementValue("initial", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1001,7 +947,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1065,7 +1011,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1239,31 +1185,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (QuestionElement != null) yield return QuestionElement; - if (OperatorElement != null) yield return OperatorElement; - if (Answer != null) yield return Answer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (QuestionElement != null) yield return new ElementValue("question", QuestionElement); - if (OperatorElement != null) yield return new ElementValue("operator", OperatorElement); - if (Answer != null) yield return new ElementValue("answer", Answer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1282,7 +1204,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1301,7 +1223,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (QuestionElement is not null) yield return new KeyValuePair("question",QuestionElement); @@ -1422,29 +1344,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - if (InitialSelectedElement != null) yield return InitialSelectedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - if (InitialSelectedElement != null) yield return new ElementValue("initialSelected", InitialSelectedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1460,7 +1360,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1476,7 +1376,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -1562,27 +1462,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1595,7 +1475,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1608,7 +1488,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2346,73 +2226,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in DerivedFromElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - foreach (var elem in SubjectTypeElement) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in DerivedFromElement) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - foreach (var elem in SubjectTypeElement) { if (elem != null) yield return new ElementValue("subjectType", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2494,7 +2308,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2576,7 +2390,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs index be8a1b1ca7..b466163ee1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/QuestionnaireResponse.cs @@ -293,35 +293,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (DefinitionElement != null) yield return DefinitionElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in Answer) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -346,7 +318,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -371,7 +343,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -477,29 +449,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -515,7 +465,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -531,7 +481,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -831,47 +781,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (QuestionnaireElement != null) yield return QuestionnaireElement; - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (AuthoredElement != null) yield return AuthoredElement; - if (Author != null) yield return Author; - if (Source != null) yield return Source; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (QuestionnaireElement != null) yield return new ElementValue("questionnaire", QuestionnaireElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (AuthoredElement != null) yield return new ElementValue("authored", AuthoredElement); - if (Author != null) yield return new ElementValue("author", Author); - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -914,7 +824,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -957,7 +867,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs b/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs index 2c482cf2a1..628eadd5dd 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Ratio.cs @@ -131,29 +131,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Numerator != null) yield return Numerator; - if (Denominator != null) yield return Denominator; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Numerator != null) yield return new ElementValue("numerator", Numerator); - if (Denominator != null) yield return new ElementValue("denominator", Denominator); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -169,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -185,7 +163,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Numerator is not null) yield return new KeyValuePair("numerator",Numerator); diff --git a/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs b/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs index bc866d60fd..08a73b8efc 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RatioRange.cs @@ -147,31 +147,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LowNumerator != null) yield return LowNumerator; - if (HighNumerator != null) yield return HighNumerator; - if (Denominator != null) yield return Denominator; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LowNumerator != null) yield return new ElementValue("lowNumerator", LowNumerator); - if (HighNumerator != null) yield return new ElementValue("highNumerator", HighNumerator); - if (Denominator != null) yield return new ElementValue("denominator", Denominator); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -190,7 +166,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -209,7 +185,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LowNumerator is not null) yield return new KeyValuePair("lowNumerator",LowNumerator); diff --git a/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs b/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs index 9939432b27..d1ea3fa56a 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RegulatedAuthorization.cs @@ -199,35 +199,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Type != null) yield return Type; - if (Status != null) yield return Status; - if (Date != null) yield return Date; - foreach (var elem in Application) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Type != null) yield return new ElementValue("type", Type); - if (Status != null) yield return new ElementValue("status", Status); - if (Date != null) yield return new ElementValue("date", Date); - foreach (var elem in Application) { if (elem != null) yield return new ElementValue("application", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -252,7 +224,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -277,7 +249,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -625,55 +597,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Subject) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Region) { if (elem != null) yield return elem; } - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - if (ValidityPeriod != null) yield return ValidityPeriod; - foreach (var elem in Indication) { if (elem != null) yield return elem; } - if (IntendedUse != null) yield return IntendedUse; - foreach (var elem in Basis) { if (elem != null) yield return elem; } - if (Holder != null) yield return Holder; - if (Regulator != null) yield return Regulator; - foreach (var elem in AttachedDocument) { if (elem != null) yield return elem; } - if (Case != null) yield return Case; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Region) { if (elem != null) yield return new ElementValue("region", elem); } - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - foreach (var elem in Indication) { if (elem != null) yield return new ElementValue("indication", elem); } - if (IntendedUse != null) yield return new ElementValue("intendedUse", IntendedUse); - foreach (var elem in Basis) { if (elem != null) yield return new ElementValue("basis", elem); } - if (Holder != null) yield return new ElementValue("holder", Holder); - if (Regulator != null) yield return new ElementValue("regulator", Regulator); - foreach (var elem in AttachedDocument) { if (elem != null) yield return new ElementValue("attachedDocument", elem); } - if (Case != null) yield return new ElementValue("case", Case); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -728,7 +652,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -783,7 +707,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs index c1277772c3..aff7045c35 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RelatedPerson.cs @@ -166,29 +166,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (PreferredElement != null) yield return PreferredElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -204,7 +182,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -220,7 +198,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -529,49 +507,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Patient != null) yield return Patient; - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Address) { if (elem != null) yield return elem; } - foreach (var elem in Photo) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in Communication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -617,7 +553,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -663,7 +599,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs b/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs index e3dec8d082..2084ebbfc8 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RequestOrchestration.cs @@ -794,79 +794,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (PrefixElement != null) yield return PrefixElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TextEquivalentElement != null) yield return TextEquivalentElement; - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - foreach (var elem in RelatedAction) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - if (Location != null) yield return Location; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (GroupingBehaviorElement != null) yield return GroupingBehaviorElement; - if (SelectionBehaviorElement != null) yield return SelectionBehaviorElement; - if (RequiredBehaviorElement != null) yield return RequiredBehaviorElement; - if (PrecheckBehaviorElement != null) yield return PrecheckBehaviorElement; - if (CardinalityBehaviorElement != null) yield return CardinalityBehaviorElement; - if (Resource != null) yield return Resource; - if (Definition != null) yield return Definition; - if (TransformElement != null) yield return TransformElement; - foreach (var elem in DynamicValue) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TextEquivalentElement != null) yield return new ElementValue("textEquivalent", TextEquivalentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - foreach (var elem in RelatedAction) { if (elem != null) yield return new ElementValue("relatedAction", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (GroupingBehaviorElement != null) yield return new ElementValue("groupingBehavior", GroupingBehaviorElement); - if (SelectionBehaviorElement != null) yield return new ElementValue("selectionBehavior", SelectionBehaviorElement); - if (RequiredBehaviorElement != null) yield return new ElementValue("requiredBehavior", RequiredBehaviorElement); - if (PrecheckBehaviorElement != null) yield return new ElementValue("precheckBehavior", PrecheckBehaviorElement); - if (CardinalityBehaviorElement != null) yield return new ElementValue("cardinalityBehavior", CardinalityBehaviorElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - if (Definition != null) yield return new ElementValue("definition", Definition); - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in DynamicValue) { if (elem != null) yield return new ElementValue("dynamicValue", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -957,7 +885,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1048,7 +976,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1191,29 +1119,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1229,7 +1135,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1245,7 +1151,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -1393,31 +1299,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Requirement != null) yield return Requirement; - if (RelatedDataElement != null) yield return RelatedDataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Requirement != null) yield return new ElementValue("requirement", Requirement); - if (RelatedDataElement != null) yield return new ElementValue("relatedData", RelatedDataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1436,7 +1318,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1455,7 +1337,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1604,31 +1486,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Requirement != null) yield return Requirement; - if (RelatedDataElement != null) yield return RelatedDataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Requirement != null) yield return new ElementValue("requirement", Requirement); - if (RelatedDataElement != null) yield return new ElementValue("relatedData", RelatedDataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1647,7 +1505,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1666,7 +1524,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1857,33 +1715,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TargetIdElement != null) yield return TargetIdElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (EndRelationshipElement != null) yield return EndRelationshipElement; - if (Offset != null) yield return Offset; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TargetIdElement != null) yield return new ElementValue("targetId", TargetIdElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (EndRelationshipElement != null) yield return new ElementValue("endRelationship", EndRelationshipElement); - if (Offset != null) yield return new ElementValue("offset", Offset); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1905,7 +1737,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1927,7 +1759,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TargetIdElement is not null) yield return new KeyValuePair("targetId",TargetIdElement); @@ -2135,37 +1967,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (TypeCanonicalElement != null) yield return TypeCanonicalElement; - if (TypeReference != null) yield return TypeReference; - if (Role != null) yield return Role; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TypeCanonicalElement != null) yield return new ElementValue("typeCanonical", TypeCanonicalElement); - if (TypeReference != null) yield return new ElementValue("typeReference", TypeReference); - if (Role != null) yield return new ElementValue("role", Role); - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2193,7 +1995,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2221,7 +2023,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2340,29 +2142,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (Expression != null) yield return Expression; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (Expression != null) yield return new ElementValue("expression", Expression); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2378,7 +2158,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2394,7 +2174,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -2871,61 +2651,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Author != null) yield return Author; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2989,7 +2715,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3053,7 +2779,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs b/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs index b9e2e0e395..3a8ed1a436 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Requirements.cs @@ -480,45 +480,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KeyElement != null) yield return KeyElement; - if (LabelElement != null) yield return LabelElement; - foreach (var elem in ConformanceElement) { if (elem != null) yield return elem; } - if (ConditionalityElement != null) yield return ConditionalityElement; - if (RequirementElement != null) yield return RequirementElement; - if (DerivedFromElement != null) yield return DerivedFromElement; - if (ParentElement != null) yield return ParentElement; - foreach (var elem in SatisfiedByElement) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceElement) { if (elem != null) yield return elem; } - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KeyElement != null) yield return new ElementValue("key", KeyElement); - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - foreach (var elem in ConformanceElement) { if (elem != null) yield return new ElementValue("conformance", elem); } - if (ConditionalityElement != null) yield return new ElementValue("conditionality", ConditionalityElement); - if (RequirementElement != null) yield return new ElementValue("requirement", RequirementElement); - if (DerivedFromElement != null) yield return new ElementValue("derivedFrom", DerivedFromElement); - if (ParentElement != null) yield return new ElementValue("parent", ParentElement); - foreach (var elem in SatisfiedByElement) { if (elem != null) yield return new ElementValue("satisfiedBy", elem); } - foreach (var elem in ReferenceElement) { if (elem != null) yield return new ElementValue("reference", elem); } - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -558,7 +520,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -598,7 +560,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KeyElement is not null) yield return new KeyValuePair("key",KeyElement); @@ -1276,67 +1238,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - foreach (var elem in DerivedFromElement) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceElement) { if (elem != null) yield return elem; } - foreach (var elem in ActorElement) { if (elem != null) yield return elem; } - foreach (var elem in Statement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - foreach (var elem in DerivedFromElement) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - foreach (var elem in ReferenceElement) { if (elem != null) yield return new ElementValue("reference", elem); } - foreach (var elem in ActorElement) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Statement) { if (elem != null) yield return new ElementValue("statement", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1409,7 +1311,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1482,7 +1384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs index 3d3025e629..81307ba324 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ResearchStudy.cs @@ -163,29 +163,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -201,7 +179,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -217,7 +195,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -386,35 +364,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Role != null) yield return Role; - foreach (var elem in Period) { if (elem != null) yield return elem; } - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Role != null) yield return new ElementValue("role", Role); - foreach (var elem in Period) { if (elem != null) yield return new ElementValue("period", elem); } - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +389,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -464,7 +414,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -596,31 +546,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (State != null) yield return State; - if (ActualElement != null) yield return ActualElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (State != null) yield return new ElementValue("state", State); - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -639,7 +565,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -658,7 +584,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (State is not null) yield return new KeyValuePair("state",State); @@ -824,33 +750,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TargetNumberElement != null) yield return TargetNumberElement; - if (ActualNumberElement != null) yield return ActualNumberElement; - if (Eligibility != null) yield return Eligibility; - if (ActualGroup != null) yield return ActualGroup; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TargetNumberElement != null) yield return new ElementValue("targetNumber", TargetNumberElement); - if (ActualNumberElement != null) yield return new ElementValue("actualNumber", ActualNumberElement); - if (Eligibility != null) yield return new ElementValue("eligibility", Eligibility); - if (ActualGroup != null) yield return new ElementValue("actualGroup", ActualGroup); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -872,7 +772,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -894,7 +794,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TargetNumberElement is not null) yield return new KeyValuePair("targetNumber",TargetNumberElement); @@ -1118,37 +1018,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in IntendedExposure) { if (elem != null) yield return elem; } - if (ObservedGroup != null) yield return ObservedGroup; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in IntendedExposure) { if (elem != null) yield return new ElementValue("intendedExposure", elem); } - if (ObservedGroup != null) yield return new ElementValue("observedGroup", ObservedGroup); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1176,7 +1046,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1204,7 +1074,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -1357,31 +1227,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1400,7 +1246,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1419,7 +1265,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1589,33 +1435,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1637,7 +1457,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1659,7 +1479,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2406,89 +2226,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in Label) { if (elem != null) yield return elem; } - foreach (var elem in Protocol) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - if (DateElement != null) yield return DateElement; - if (StatusElement != null) yield return StatusElement; - if (PrimaryPurposeType != null) yield return PrimaryPurposeType; - if (Phase != null) yield return Phase; - foreach (var elem in StudyDesign) { if (elem != null) yield return elem; } - foreach (var elem in Focus) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Keyword) { if (elem != null) yield return elem; } - foreach (var elem in Region) { if (elem != null) yield return elem; } - if (DescriptionSummaryElement != null) yield return DescriptionSummaryElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Period != null) yield return Period; - foreach (var elem in Site) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Classifier) { if (elem != null) yield return elem; } - foreach (var elem in AssociatedParty) { if (elem != null) yield return elem; } - foreach (var elem in ProgressStatus) { if (elem != null) yield return elem; } - if (WhyStopped != null) yield return WhyStopped; - if (Recruitment != null) yield return Recruitment; - foreach (var elem in ComparisonGroup) { if (elem != null) yield return elem; } - foreach (var elem in Objective) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeMeasure) { if (elem != null) yield return elem; } - foreach (var elem in Result) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in Label) { if (elem != null) yield return new ElementValue("label", elem); } - foreach (var elem in Protocol) { if (elem != null) yield return new ElementValue("protocol", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (PrimaryPurposeType != null) yield return new ElementValue("primaryPurposeType", PrimaryPurposeType); - if (Phase != null) yield return new ElementValue("phase", Phase); - foreach (var elem in StudyDesign) { if (elem != null) yield return new ElementValue("studyDesign", elem); } - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Keyword) { if (elem != null) yield return new ElementValue("keyword", elem); } - foreach (var elem in Region) { if (elem != null) yield return new ElementValue("region", elem); } - if (DescriptionSummaryElement != null) yield return new ElementValue("descriptionSummary", DescriptionSummaryElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Classifier) { if (elem != null) yield return new ElementValue("classifier", elem); } - foreach (var elem in AssociatedParty) { if (elem != null) yield return new ElementValue("associatedParty", elem); } - foreach (var elem in ProgressStatus) { if (elem != null) yield return new ElementValue("progressStatus", elem); } - if (WhyStopped != null) yield return new ElementValue("whyStopped", WhyStopped); - if (Recruitment != null) yield return new ElementValue("recruitment", Recruitment); - foreach (var elem in ComparisonGroup) { if (elem != null) yield return new ElementValue("comparisonGroup", elem); } - foreach (var elem in Objective) { if (elem != null) yield return new ElementValue("objective", elem); } - foreach (var elem in OutcomeMeasure) { if (elem != null) yield return new ElementValue("outcomeMeasure", elem); } - foreach (var elem in Result) { if (elem != null) yield return new ElementValue("result", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2594,7 +2332,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2700,7 +2438,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs index 30225977fc..6e25ac00b4 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ResearchSubject.cs @@ -341,37 +341,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (SubjectState != null) yield return SubjectState; - if (Milestone != null) yield return Milestone; - if (Reason != null) yield return Reason; - if (StartDateElement != null) yield return StartDateElement; - if (EndDateElement != null) yield return EndDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (SubjectState != null) yield return new ElementValue("subjectState", SubjectState); - if (Milestone != null) yield return new ElementValue("milestone", Milestone); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (StartDateElement != null) yield return new ElementValue("startDate", StartDateElement); - if (EndDateElement != null) yield return new ElementValue("endDate", EndDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -399,7 +369,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -427,7 +397,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -693,43 +663,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Progress) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Study != null) yield return Study; - if (Subject != null) yield return Subject; - if (AssignedComparisonGroupElement != null) yield return AssignedComparisonGroupElement; - if (ActualComparisonGroupElement != null) yield return ActualComparisonGroupElement; - foreach (var elem in Consent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Progress) { if (elem != null) yield return new ElementValue("progress", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Study != null) yield return new ElementValue("study", Study); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (AssignedComparisonGroupElement != null) yield return new ElementValue("assignedComparisonGroup", AssignedComparisonGroupElement); - if (ActualComparisonGroupElement != null) yield return new ElementValue("actualComparisonGroup", ActualComparisonGroupElement); - foreach (var elem in Consent) { if (elem != null) yield return new ElementValue("consent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -766,7 +700,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -803,7 +737,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs index 95a7336eba..5e661eacba 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/RiskAssessment.cs @@ -253,37 +253,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Outcome != null) yield return Outcome; - if (Probability != null) yield return Probability; - if (QualitativeRisk != null) yield return QualitativeRisk; - if (RelativeRiskElement != null) yield return RelativeRiskElement; - if (When != null) yield return When; - if (RationaleElement != null) yield return RationaleElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (Probability != null) yield return new ElementValue("probability", Probability); - if (QualitativeRisk != null) yield return new ElementValue("qualitativeRisk", QualitativeRisk); - if (RelativeRiskElement != null) yield return new ElementValue("relativeRisk", RelativeRiskElement); - if (When != null) yield return new ElementValue("when", When); - if (RationaleElement != null) yield return new ElementValue("rationale", RationaleElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -311,7 +281,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -339,7 +309,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Outcome is not null) yield return new KeyValuePair("outcome",Outcome); @@ -711,57 +681,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (BasedOn != null) yield return BasedOn; - if (Parent != null) yield return Parent; - if (StatusElement != null) yield return StatusElement; - if (Method != null) yield return Method; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (Condition != null) yield return Condition; - if (Performer != null) yield return Performer; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Basis) { if (elem != null) yield return elem; } - foreach (var elem in Prediction) { if (elem != null) yield return elem; } - if (MitigationElement != null) yield return MitigationElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (BasedOn != null) yield return new ElementValue("basedOn", BasedOn); - if (Parent != null) yield return new ElementValue("parent", Parent); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Method != null) yield return new ElementValue("method", Method); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Basis) { if (elem != null) yield return new ElementValue("basis", elem); } - foreach (var elem in Prediction) { if (elem != null) yield return new ElementValue("prediction", elem); } - if (MitigationElement != null) yield return new ElementValue("mitigation", MitigationElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -819,7 +739,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -877,7 +797,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs b/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs index 679e41fd5a..0b447135e4 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SampledData.cs @@ -425,45 +425,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Origin != null) yield return Origin; - if (IntervalElement != null) yield return IntervalElement; - if (IntervalUnitElement != null) yield return IntervalUnitElement; - if (FactorElement != null) yield return FactorElement; - if (LowerLimitElement != null) yield return LowerLimitElement; - if (UpperLimitElement != null) yield return UpperLimitElement; - if (DimensionsElement != null) yield return DimensionsElement; - if (CodeMapElement != null) yield return CodeMapElement; - if (OffsetsElement != null) yield return OffsetsElement; - if (DataElement != null) yield return DataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Origin != null) yield return new ElementValue("origin", Origin); - if (IntervalElement != null) yield return new ElementValue("interval", IntervalElement); - if (IntervalUnitElement != null) yield return new ElementValue("intervalUnit", IntervalUnitElement); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (LowerLimitElement != null) yield return new ElementValue("lowerLimit", LowerLimitElement); - if (UpperLimitElement != null) yield return new ElementValue("upperLimit", UpperLimitElement); - if (DimensionsElement != null) yield return new ElementValue("dimensions", DimensionsElement); - if (CodeMapElement != null) yield return new ElementValue("codeMap", CodeMapElement); - if (OffsetsElement != null) yield return new ElementValue("offsets", OffsetsElement); - if (DataElement != null) yield return new ElementValue("data", DataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -503,7 +465,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -543,7 +505,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Origin is not null) yield return new KeyValuePair("origin",Origin); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs b/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs index b98ac57d11..4b999f4135 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Schedule.cs @@ -305,43 +305,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in ServiceCategory) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - foreach (var elem in Actor) { if (elem != null) yield return elem; } - if (PlanningHorizon != null) yield return PlanningHorizon; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in ServiceCategory) { if (elem != null) yield return new ElementValue("serviceCategory", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - if (PlanningHorizon != null) yield return new ElementValue("planningHorizon", PlanningHorizon); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -378,7 +342,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -415,7 +379,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs index cfcf1b5345..bb56a2a0c6 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SearchParameter.cs @@ -213,29 +213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DefinitionElement != null) yield return DefinitionElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -251,7 +229,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -267,7 +245,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DefinitionElement is not null) yield return new KeyValuePair("definition",DefinitionElement); @@ -1296,87 +1274,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (DerivedFromElement != null) yield return DerivedFromElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in BaseElement) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (ProcessingModeElement != null) yield return ProcessingModeElement; - if (ConstraintElement != null) yield return ConstraintElement; - foreach (var elem in TargetElement) { if (elem != null) yield return elem; } - if (MultipleOrElement != null) yield return MultipleOrElement; - if (MultipleAndElement != null) yield return MultipleAndElement; - foreach (var elem in ComparatorElement) { if (elem != null) yield return elem; } - foreach (var elem in ModifierElement) { if (elem != null) yield return elem; } - foreach (var elem in ChainElement) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DerivedFromElement != null) yield return new ElementValue("derivedFrom", DerivedFromElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in BaseElement) { if (elem != null) yield return new ElementValue("base", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (ProcessingModeElement != null) yield return new ElementValue("processingMode", ProcessingModeElement); - if (ConstraintElement != null) yield return new ElementValue("constraint", ConstraintElement); - foreach (var elem in TargetElement) { if (elem != null) yield return new ElementValue("target", elem); } - if (MultipleOrElement != null) yield return new ElementValue("multipleOr", MultipleOrElement); - if (MultipleAndElement != null) yield return new ElementValue("multipleAnd", MultipleAndElement); - foreach (var elem in ComparatorElement) { if (elem != null) yield return new ElementValue("comparator", elem); } - foreach (var elem in ModifierElement) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ChainElement) { if (elem != null) yield return new ElementValue("chain", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1479,7 +1377,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1582,7 +1480,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs index e5890fe20d..00beeab497 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/ServiceRequest.cs @@ -148,29 +148,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ParameterFocus != null) yield return ParameterFocus; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ParameterFocus != null) yield return new ElementValue("parameterFocus", ParameterFocus); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -186,7 +164,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -202,7 +180,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ParameterFocus is not null) yield return new KeyValuePair("parameterFocus",ParameterFocus); @@ -300,29 +278,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -338,7 +294,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -354,7 +310,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -437,27 +393,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Instruction != null) yield return Instruction; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Instruction != null) yield return new ElementValue("instruction", Instruction); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -470,7 +406,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -483,7 +419,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Instruction is not null) yield return new KeyValuePair("instruction",Instruction); @@ -1248,91 +1184,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (Requisition != null) yield return Requisition; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Code != null) yield return Code; - foreach (var elem in OrderDetail) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (Subject != null) yield return Subject; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (Encounter != null) yield return Encounter; - if (Occurrence != null) yield return Occurrence; - if (AsNeeded != null) yield return AsNeeded; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (PerformerType != null) yield return PerformerType; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (BodyStructure != null) yield return BodyStructure; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in PatientInstruction) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in InstantiatesCanonicalElement) { if (elem != null) yield return new ElementValue("instantiatesCanonical", elem); } - foreach (var elem in InstantiatesUriElement) { if (elem != null) yield return new ElementValue("instantiatesUri", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (Requisition != null) yield return new ElementValue("requisition", Requisition); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in OrderDetail) { if (elem != null) yield return new ElementValue("orderDetail", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AsNeeded != null) yield return new ElementValue("asNeeded", AsNeeded); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (BodyStructure != null) yield return new ElementValue("bodyStructure", BodyStructure); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in PatientInstruction) { if (elem != null) yield return new ElementValue("patientInstruction", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1441,7 +1293,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1550,7 +1402,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Slot.cs b/src/Hl7.Fhir.R5/Model/Generated/Slot.cs index 4c2a9f5a41..4509fdbb98 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Slot.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Slot.cs @@ -420,47 +420,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in ServiceCategory) { if (elem != null) yield return elem; } - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in AppointmentType) { if (elem != null) yield return elem; } - if (Schedule != null) yield return Schedule; - if (StatusElement != null) yield return StatusElement; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (OverbookedElement != null) yield return OverbookedElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in ServiceCategory) { if (elem != null) yield return new ElementValue("serviceCategory", elem); } - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in AppointmentType) { if (elem != null) yield return new ElementValue("appointmentType", elem); } - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (OverbookedElement != null) yield return new ElementValue("overbooked", OverbookedElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -503,7 +463,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -546,7 +506,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs b/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs index 84e43cdc67..d9f790eb16 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Specimen.cs @@ -223,29 +223,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -261,7 +239,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -277,7 +255,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -497,43 +475,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Collector != null) yield return Collector; - if (Collected != null) yield return Collected; - if (Duration != null) yield return Duration; - if (Quantity != null) yield return Quantity; - if (Method != null) yield return Method; - if (Device != null) yield return Device; - if (Procedure != null) yield return Procedure; - if (BodySite != null) yield return BodySite; - if (FastingStatus != null) yield return FastingStatus; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Collector != null) yield return new ElementValue("collector", Collector); - if (Collected != null) yield return new ElementValue("collected", Collected); - if (Duration != null) yield return new ElementValue("duration", Duration); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Method != null) yield return new ElementValue("method", Method); - if (Device != null) yield return new ElementValue("device", Device); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (FastingStatus != null) yield return new ElementValue("fastingStatus", FastingStatus); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -570,7 +512,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -607,7 +549,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Collector is not null) yield return new KeyValuePair("collector",Collector); @@ -766,33 +708,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Method != null) yield return Method; - foreach (var elem in Additive) { if (elem != null) yield return elem; } - if (Time != null) yield return Time; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Method != null) yield return new ElementValue("method", Method); - foreach (var elem in Additive) { if (elem != null) yield return new ElementValue("additive", elem); } - if (Time != null) yield return new ElementValue("time", Time); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -814,7 +730,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -836,7 +752,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -955,31 +871,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Device != null) yield return Device; - if (Location != null) yield return Location; - if (SpecimenQuantity != null) yield return SpecimenQuantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Device != null) yield return new ElementValue("device", Device); - if (Location != null) yield return new ElementValue("location", Location); - if (SpecimenQuantity != null) yield return new ElementValue("specimenQuantity", SpecimenQuantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -998,7 +890,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1017,7 +909,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Device is not null) yield return new KeyValuePair("device",Device); @@ -1400,57 +1292,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (AccessionIdentifier != null) yield return AccessionIdentifier; - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (ReceivedTimeElement != null) yield return ReceivedTimeElement; - foreach (var elem in Parent) { if (elem != null) yield return elem; } - foreach (var elem in Request) { if (elem != null) yield return elem; } - if (CombinedElement != null) yield return CombinedElement; - foreach (var elem in Role) { if (elem != null) yield return elem; } - foreach (var elem in Feature) { if (elem != null) yield return elem; } - if (Collection != null) yield return Collection; - foreach (var elem in Processing) { if (elem != null) yield return elem; } - foreach (var elem in Container) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (AccessionIdentifier != null) yield return new ElementValue("accessionIdentifier", AccessionIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (ReceivedTimeElement != null) yield return new ElementValue("receivedTime", ReceivedTimeElement); - foreach (var elem in Parent) { if (elem != null) yield return new ElementValue("parent", elem); } - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - if (CombinedElement != null) yield return new ElementValue("combined", CombinedElement); - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - foreach (var elem in Feature) { if (elem != null) yield return new ElementValue("feature", elem); } - if (Collection != null) yield return new ElementValue("collection", Collection); - foreach (var elem in Processing) { if (elem != null) yield return new ElementValue("processing", elem); } - foreach (var elem in Container) { if (elem != null) yield return new ElementValue("container", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1508,7 +1350,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1566,7 +1408,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs index d21fb73018..0ecd8321b1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SpecimenDefinition.cs @@ -377,45 +377,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IsDerivedElement != null) yield return IsDerivedElement; - if (Type != null) yield return Type; - if (PreferenceElement != null) yield return PreferenceElement; - if (Container != null) yield return Container; - if (RequirementElement != null) yield return RequirementElement; - if (RetentionTime != null) yield return RetentionTime; - if (SingleUseElement != null) yield return SingleUseElement; - foreach (var elem in RejectionCriterion) { if (elem != null) yield return elem; } - foreach (var elem in Handling) { if (elem != null) yield return elem; } - foreach (var elem in TestingDestination) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IsDerivedElement != null) yield return new ElementValue("isDerived", IsDerivedElement); - if (Type != null) yield return new ElementValue("type", Type); - if (PreferenceElement != null) yield return new ElementValue("preference", PreferenceElement); - if (Container != null) yield return new ElementValue("container", Container); - if (RequirementElement != null) yield return new ElementValue("requirement", RequirementElement); - if (RetentionTime != null) yield return new ElementValue("retentionTime", RetentionTime); - if (SingleUseElement != null) yield return new ElementValue("singleUse", SingleUseElement); - foreach (var elem in RejectionCriterion) { if (elem != null) yield return new ElementValue("rejectionCriterion", elem); } - foreach (var elem in Handling) { if (elem != null) yield return new ElementValue("handling", elem); } - foreach (var elem in TestingDestination) { if (elem != null) yield return new ElementValue("testingDestination", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -455,7 +417,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -495,7 +457,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IsDerivedElement is not null) yield return new KeyValuePair("isDerived",IsDerivedElement); @@ -734,41 +696,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Material != null) yield return Material; - if (Type != null) yield return Type; - if (Cap != null) yield return Cap; - if (DescriptionElement != null) yield return DescriptionElement; - if (Capacity != null) yield return Capacity; - if (MinimumVolume != null) yield return MinimumVolume; - foreach (var elem in Additive) { if (elem != null) yield return elem; } - if (PreparationElement != null) yield return PreparationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Material != null) yield return new ElementValue("material", Material); - if (Type != null) yield return new ElementValue("type", Type); - if (Cap != null) yield return new ElementValue("cap", Cap); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Capacity != null) yield return new ElementValue("capacity", Capacity); - if (MinimumVolume != null) yield return new ElementValue("minimumVolume", MinimumVolume); - foreach (var elem in Additive) { if (elem != null) yield return new ElementValue("additive", elem); } - if (PreparationElement != null) yield return new ElementValue("preparation", PreparationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -802,7 +730,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -836,7 +764,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Material is not null) yield return new KeyValuePair("material",Material); @@ -927,27 +855,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Additive != null) yield return Additive; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Additive != null) yield return new ElementValue("additive", Additive); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -960,7 +868,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -973,7 +881,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Additive is not null) yield return new KeyValuePair("additive",Additive); @@ -1119,33 +1027,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TemperatureQualifier != null) yield return TemperatureQualifier; - if (TemperatureRange != null) yield return TemperatureRange; - if (MaxDuration != null) yield return MaxDuration; - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TemperatureQualifier != null) yield return new ElementValue("temperatureQualifier", TemperatureQualifier); - if (TemperatureRange != null) yield return new ElementValue("temperatureRange", TemperatureRange); - if (MaxDuration != null) yield return new ElementValue("maxDuration", MaxDuration); - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1167,7 +1049,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1189,7 +1071,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TemperatureQualifier is not null) yield return new KeyValuePair("temperatureQualifier",TemperatureQualifier); @@ -2015,81 +1897,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in DerivedFromCanonicalElement) { if (elem != null) yield return elem; } - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - if (TypeCollected != null) yield return TypeCollected; - foreach (var elem in PatientPreparation) { if (elem != null) yield return elem; } - if (TimeAspectElement != null) yield return TimeAspectElement; - foreach (var elem in Collection) { if (elem != null) yield return elem; } - foreach (var elem in TypeTested) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in DerivedFromCanonicalElement) { if (elem != null) yield return new ElementValue("derivedFromCanonical", elem); } - foreach (var elem in DerivedFromUriElement) { if (elem != null) yield return new ElementValue("derivedFromUri", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - if (TypeCollected != null) yield return new ElementValue("typeCollected", TypeCollected); - foreach (var elem in PatientPreparation) { if (elem != null) yield return new ElementValue("patientPreparation", elem); } - if (TimeAspectElement != null) yield return new ElementValue("timeAspect", TimeAspectElement); - foreach (var elem in Collection) { if (elem != null) yield return new ElementValue("collection", elem); } - foreach (var elem in TypeTested) { if (elem != null) yield return new ElementValue("typeTested", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2183,7 +1991,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2277,7 +2085,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs index 32e289d8e9..ba5746d427 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/StructureMap.cs @@ -516,33 +516,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (ModeElement != null) yield return ModeElement; - if (AliasElement != null) yield return AliasElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (AliasElement != null) yield return new ElementValue("alias", AliasElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -564,7 +538,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -586,7 +560,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); @@ -720,29 +694,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -758,7 +710,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -774,7 +726,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1011,37 +963,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ExtendsElement != null) yield return ExtendsElement; - if (TypeModeElement != null) yield return TypeModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ExtendsElement != null) yield return new ElementValue("extends", ExtendsElement); - if (TypeModeElement != null) yield return new ElementValue("typeMode", TypeModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1069,7 +991,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1097,7 +1019,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1306,33 +1228,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TypeElement != null) yield return TypeElement; - if (ModeElement != null) yield return ModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1354,7 +1250,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1376,7 +1272,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1575,37 +1471,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in Source) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - foreach (var elem in Dependent) { if (elem != null) yield return elem; } - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - foreach (var elem in Dependent) { if (elem != null) yield return new ElementValue("dependent", elem); } - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1633,7 +1499,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1661,7 +1527,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2103,47 +1969,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContextElement != null) yield return ContextElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (TypeElement != null) yield return TypeElement; - if (DefaultValueElement != null) yield return DefaultValueElement; - if (ElementElement != null) yield return ElementElement; - if (ListModeElement != null) yield return ListModeElement; - if (VariableElement != null) yield return VariableElement; - if (ConditionElement != null) yield return ConditionElement; - if (CheckElement != null) yield return CheckElement; - if (LogMessageElement != null) yield return LogMessageElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContextElement != null) yield return new ElementValue("context", ContextElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DefaultValueElement != null) yield return new ElementValue("defaultValue", DefaultValueElement); - if (ElementElement != null) yield return new ElementValue("element", ElementElement); - if (ListModeElement != null) yield return new ElementValue("listMode", ListModeElement); - if (VariableElement != null) yield return new ElementValue("variable", VariableElement); - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - if (CheckElement != null) yield return new ElementValue("check", CheckElement); - if (LogMessageElement != null) yield return new ElementValue("logMessage", LogMessageElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2186,7 +2012,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2229,7 +2055,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContextElement is not null) yield return new KeyValuePair("context",ContextElement); @@ -2525,39 +2351,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContextElement != null) yield return ContextElement; - if (ElementElement != null) yield return ElementElement; - if (VariableElement != null) yield return VariableElement; - foreach (var elem in ListModeElement) { if (elem != null) yield return elem; } - if (ListRuleIdElement != null) yield return ListRuleIdElement; - if (TransformElement != null) yield return TransformElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContextElement != null) yield return new ElementValue("context", ContextElement); - if (ElementElement != null) yield return new ElementValue("element", ElementElement); - if (VariableElement != null) yield return new ElementValue("variable", VariableElement); - foreach (var elem in ListModeElement) { if (elem != null) yield return new ElementValue("listMode", elem); } - if (ListRuleIdElement != null) yield return new ElementValue("listRuleId", ListRuleIdElement); - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2588,7 +2382,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2619,7 +2413,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContextElement is not null) yield return new KeyValuePair("context",ContextElement); @@ -2704,27 +2498,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2737,7 +2511,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2750,7 +2524,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2862,29 +2636,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2900,7 +2652,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2916,7 +2668,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -3552,67 +3304,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - foreach (var elem in Structure) { if (elem != null) yield return elem; } - foreach (var elem in ImportElement) { if (elem != null) yield return elem; } - foreach (var elem in Const) { if (elem != null) yield return elem; } - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - foreach (var elem in Structure) { if (elem != null) yield return new ElementValue("structure", elem); } - foreach (var elem in ImportElement) { if (elem != null) yield return new ElementValue("import", elem); } - foreach (var elem in Const) { if (elem != null) yield return new ElementValue("const", elem); } - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3685,7 +3377,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3758,7 +3450,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs b/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs index cf37379f5a..6b6b31735f 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Subscription.cs @@ -319,35 +319,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResourceTypeElement != null) yield return ResourceTypeElement; - if (FilterParameterElement != null) yield return FilterParameterElement; - if (ComparatorElement != null) yield return ComparatorElement; - if (ModifierElement != null) yield return ModifierElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResourceTypeElement != null) yield return new ElementValue("resourceType", ResourceTypeElement); - if (FilterParameterElement != null) yield return new ElementValue("filterParameter", FilterParameterElement); - if (ComparatorElement != null) yield return new ElementValue("comparator", ComparatorElement); - if (ModifierElement != null) yield return new ElementValue("modifier", ModifierElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -372,7 +344,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -397,7 +369,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResourceTypeElement is not null) yield return new KeyValuePair("resourceType",ResourceTypeElement); @@ -535,29 +507,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -573,7 +523,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -589,7 +539,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1124,59 +1074,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (TopicElement != null) yield return TopicElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (EndElement != null) yield return EndElement; - if (ManagingEntity != null) yield return ManagingEntity; - if (ReasonElement != null) yield return ReasonElement; - foreach (var elem in FilterBy) { if (elem != null) yield return elem; } - if (ChannelType != null) yield return ChannelType; - if (EndpointElement != null) yield return EndpointElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (HeartbeatPeriodElement != null) yield return HeartbeatPeriodElement; - if (TimeoutElement != null) yield return TimeoutElement; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (ContentElement != null) yield return ContentElement; - if (MaxCountElement != null) yield return MaxCountElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TopicElement != null) yield return new ElementValue("topic", TopicElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (ManagingEntity != null) yield return new ElementValue("managingEntity", ManagingEntity); - if (ReasonElement != null) yield return new ElementValue("reason", ReasonElement); - foreach (var elem in FilterBy) { if (elem != null) yield return new ElementValue("filterBy", elem); } - if (ChannelType != null) yield return new ElementValue("channelType", ChannelType); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (HeartbeatPeriodElement != null) yield return new ElementValue("heartbeatPeriod", HeartbeatPeriodElement); - if (TimeoutElement != null) yield return new ElementValue("timeout", TimeoutElement); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (ContentElement != null) yield return new ElementValue("content", ContentElement); - if (MaxCountElement != null) yield return new ElementValue("maxCount", MaxCountElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1237,7 +1135,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1298,7 +1196,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs index 75d83880a4..bb1bc63f13 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionStatus.cs @@ -260,33 +260,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (EventNumberElement != null) yield return EventNumberElement; - if (TimestampElement != null) yield return TimestampElement; - if (Focus != null) yield return Focus; - foreach (var elem in AdditionalContext) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (EventNumberElement != null) yield return new ElementValue("eventNumber", EventNumberElement); - if (TimestampElement != null) yield return new ElementValue("timestamp", TimestampElement); - if (Focus != null) yield return new ElementValue("focus", Focus); - foreach (var elem in AdditionalContext) { if (elem != null) yield return new ElementValue("additionalContext", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -308,7 +282,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -330,7 +304,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (EventNumberElement is not null) yield return new KeyValuePair("eventNumber",EventNumberElement); @@ -575,39 +549,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (TypeElement != null) yield return TypeElement; - if (EventsSinceSubscriptionStartElement != null) yield return EventsSinceSubscriptionStartElement; - foreach (var elem in NotificationEvent) { if (elem != null) yield return elem; } - if (Subscription != null) yield return Subscription; - if (TopicElement != null) yield return TopicElement; - foreach (var elem in Error) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (EventsSinceSubscriptionStartElement != null) yield return new ElementValue("eventsSinceSubscriptionStart", EventsSinceSubscriptionStartElement); - foreach (var elem in NotificationEvent) { if (elem != null) yield return new ElementValue("notificationEvent", elem); } - if (Subscription != null) yield return new ElementValue("subscription", Subscription); - if (TopicElement != null) yield return new ElementValue("topic", TopicElement); - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -638,7 +580,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -669,7 +611,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs index b218e117ba..aa640112c1 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubscriptionTopic.cs @@ -321,35 +321,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (ResourceElement != null) yield return ResourceElement; - foreach (var elem in SupportedInteractionElement) { if (elem != null) yield return elem; } - if (QueryCriteria != null) yield return QueryCriteria; - if (FhirPathCriteriaElement != null) yield return FhirPathCriteriaElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - foreach (var elem in SupportedInteractionElement) { if (elem != null) yield return new ElementValue("supportedInteraction", elem); } - if (QueryCriteria != null) yield return new ElementValue("queryCriteria", QueryCriteria); - if (FhirPathCriteriaElement != null) yield return new ElementValue("fhirPathCriteria", FhirPathCriteriaElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -374,7 +346,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -399,7 +371,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -640,35 +612,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PreviousElement != null) yield return PreviousElement; - if (ResultForCreateElement != null) yield return ResultForCreateElement; - if (CurrentElement != null) yield return CurrentElement; - if (ResultForDeleteElement != null) yield return ResultForDeleteElement; - if (RequireBothElement != null) yield return RequireBothElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PreviousElement != null) yield return new ElementValue("previous", PreviousElement); - if (ResultForCreateElement != null) yield return new ElementValue("resultForCreate", ResultForCreateElement); - if (CurrentElement != null) yield return new ElementValue("current", CurrentElement); - if (ResultForDeleteElement != null) yield return new ElementValue("resultForDelete", ResultForDeleteElement); - if (RequireBothElement != null) yield return new ElementValue("requireBoth", RequireBothElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -693,7 +637,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -718,7 +662,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PreviousElement is not null) yield return new KeyValuePair("previous",PreviousElement); @@ -873,31 +817,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Event != null) yield return Event; - if (ResourceElement != null) yield return ResourceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Event != null) yield return new ElementValue("event", Event); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -916,7 +836,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -935,7 +855,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1212,37 +1132,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (ResourceElement != null) yield return ResourceElement; - if (FilterParameterElement != null) yield return FilterParameterElement; - if (FilterDefinitionElement != null) yield return FilterDefinitionElement; - foreach (var elem in ComparatorElement) { if (elem != null) yield return elem; } - foreach (var elem in ModifierElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (FilterParameterElement != null) yield return new ElementValue("filterParameter", FilterParameterElement); - if (FilterDefinitionElement != null) yield return new ElementValue("filterDefinition", FilterDefinitionElement); - foreach (var elem in ComparatorElement) { if (elem != null) yield return new ElementValue("comparator", elem); } - foreach (var elem in ModifierElement) { if (elem != null) yield return new ElementValue("modifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1270,7 +1160,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1298,7 +1188,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1472,31 +1362,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResourceElement != null) yield return ResourceElement; - foreach (var elem in IncludeElement) { if (elem != null) yield return elem; } - foreach (var elem in RevIncludeElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - foreach (var elem in IncludeElement) { if (elem != null) yield return new ElementValue("include", elem); } - foreach (var elem in RevIncludeElement) { if (elem != null) yield return new ElementValue("revInclude", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1515,7 +1381,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1534,7 +1400,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResourceElement is not null) yield return new KeyValuePair("resource",ResourceElement); @@ -2271,75 +2137,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in DerivedFromElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in ResourceTrigger) { if (elem != null) yield return elem; } - foreach (var elem in EventTrigger) { if (elem != null) yield return elem; } - foreach (var elem in CanFilterBy) { if (elem != null) yield return elem; } - foreach (var elem in NotificationShape) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in DerivedFromElement) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in ResourceTrigger) { if (elem != null) yield return new ElementValue("resourceTrigger", elem); } - foreach (var elem in EventTrigger) { if (elem != null) yield return new ElementValue("eventTrigger", elem); } - foreach (var elem in CanFilterBy) { if (elem != null) yield return new ElementValue("canFilterBy", elem); } - foreach (var elem in NotificationShape) { if (elem != null) yield return new ElementValue("notificationShape", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2424,7 +2222,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2509,7 +2307,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Substance.cs b/src/Hl7.Fhir.R5/Model/Generated/Substance.cs index 9561af9056..66014ac8f2 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Substance.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Substance.cs @@ -176,29 +176,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Substance != null) yield return Substance; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Substance != null) yield return new ElementValue("substance", Substance); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -214,7 +192,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -230,7 +208,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -505,43 +483,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (InstanceElement != null) yield return InstanceElement; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (ExpiryElement != null) yield return ExpiryElement; - if (Quantity != null) yield return Quantity; - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (InstanceElement != null) yield return new ElementValue("instance", InstanceElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ExpiryElement != null) yield return new ElementValue("expiry", ExpiryElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -578,7 +520,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -615,7 +557,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs index 1f2be3dccf..c3a29cd622 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceDefinition.cs @@ -277,41 +277,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (Stereochemistry != null) yield return Stereochemistry; - if (OpticalActivity != null) yield return OpticalActivity; - if (MolecularFormulaElement != null) yield return MolecularFormulaElement; - if (Amount != null) yield return Amount; - if (MeasurementType != null) yield return MeasurementType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Stereochemistry != null) yield return new ElementValue("stereochemistry", Stereochemistry); - if (OpticalActivity != null) yield return new ElementValue("opticalActivity", OpticalActivity); - if (MolecularFormulaElement != null) yield return new ElementValue("molecularFormula", MolecularFormulaElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (MeasurementType != null) yield return new ElementValue("measurementType", MeasurementType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -345,7 +311,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -379,7 +345,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -531,33 +497,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Technique != null) yield return Technique; - if (Form != null) yield return Form; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in File) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Technique != null) yield return new ElementValue("technique", Technique); - if (Form != null) yield return new ElementValue("form", Form); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in File) { if (elem != null) yield return new ElementValue("file", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -579,7 +519,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -601,7 +541,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Technique is not null) yield return new KeyValuePair("technique",Technique); @@ -700,29 +640,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -738,7 +656,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -754,7 +672,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -869,31 +787,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Method != null) yield return Method; - if (Type != null) yield return Type; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Method != null) yield return new ElementValue("method", Method); - if (Type != null) yield return new ElementValue("type", Type); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -912,7 +806,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -931,7 +825,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Method is not null) yield return new KeyValuePair("method",Method); @@ -1165,41 +1059,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Stereochemistry != null) yield return Stereochemistry; - if (OpticalActivity != null) yield return OpticalActivity; - if (MolecularFormulaElement != null) yield return MolecularFormulaElement; - if (MolecularFormulaByMoietyElement != null) yield return MolecularFormulaByMoietyElement; - if (MolecularWeight != null) yield return MolecularWeight; - foreach (var elem in Technique) { if (elem != null) yield return elem; } - foreach (var elem in SourceDocument) { if (elem != null) yield return elem; } - foreach (var elem in Representation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Stereochemistry != null) yield return new ElementValue("stereochemistry", Stereochemistry); - if (OpticalActivity != null) yield return new ElementValue("opticalActivity", OpticalActivity); - if (MolecularFormulaElement != null) yield return new ElementValue("molecularFormula", MolecularFormulaElement); - if (MolecularFormulaByMoietyElement != null) yield return new ElementValue("molecularFormulaByMoiety", MolecularFormulaByMoietyElement); - if (MolecularWeight != null) yield return new ElementValue("molecularWeight", MolecularWeight); - foreach (var elem in Technique) { if (elem != null) yield return new ElementValue("technique", elem); } - foreach (var elem in SourceDocument) { if (elem != null) yield return new ElementValue("sourceDocument", elem); } - foreach (var elem in Representation) { if (elem != null) yield return new ElementValue("representation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1233,7 +1093,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1267,7 +1127,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Stereochemistry is not null) yield return new KeyValuePair("stereochemistry",Stereochemistry); @@ -1420,33 +1280,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (RepresentationElement != null) yield return RepresentationElement; - if (Format != null) yield return Format; - if (Document != null) yield return Document; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (RepresentationElement != null) yield return new ElementValue("representation", RepresentationElement); - if (Format != null) yield return new ElementValue("format", Format); - if (Document != null) yield return new ElementValue("document", Document); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1468,7 +1302,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1490,7 +1324,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1656,35 +1490,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Status != null) yield return Status; - if (StatusDateElement != null) yield return StatusDateElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Status != null) yield return new ElementValue("status", Status); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1709,7 +1515,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1734,7 +1540,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -2025,47 +1831,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Type != null) yield return Type; - if (Status != null) yield return Status; - if (PreferredElement != null) yield return PreferredElement; - foreach (var elem in Language) { if (elem != null) yield return elem; } - foreach (var elem in Domain) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in Synonym) { if (elem != null) yield return elem; } - foreach (var elem in Translation) { if (elem != null) yield return elem; } - foreach (var elem in Official) { if (elem != null) yield return elem; } - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Status != null) yield return new ElementValue("status", Status); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - foreach (var elem in Language) { if (elem != null) yield return new ElementValue("language", elem); } - foreach (var elem in Domain) { if (elem != null) yield return new ElementValue("domain", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in Synonym) { if (elem != null) yield return new ElementValue("synonym", elem); } - foreach (var elem in Translation) { if (elem != null) yield return new ElementValue("translation", elem); } - foreach (var elem in Official) { if (elem != null) yield return new ElementValue("official", elem); } - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2108,7 +1874,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2151,7 +1917,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2289,31 +2055,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Authority != null) yield return Authority; - if (Status != null) yield return Status; - if (DateElement != null) yield return DateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Authority != null) yield return new ElementValue("authority", Authority); - if (Status != null) yield return new ElementValue("status", Status); - if (DateElement != null) yield return new ElementValue("date", DateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2332,7 +2074,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2351,7 +2093,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Authority is not null) yield return new KeyValuePair("authority",Authority); @@ -2557,39 +2299,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SubstanceDefinition != null) yield return SubstanceDefinition; - if (Type != null) yield return Type; - if (IsDefiningElement != null) yield return IsDefiningElement; - if (Amount != null) yield return Amount; - if (RatioHighLimitAmount != null) yield return RatioHighLimitAmount; - if (Comparator != null) yield return Comparator; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SubstanceDefinition != null) yield return new ElementValue("substanceDefinition", SubstanceDefinition); - if (Type != null) yield return new ElementValue("type", Type); - if (IsDefiningElement != null) yield return new ElementValue("isDefining", IsDefiningElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (RatioHighLimitAmount != null) yield return new ElementValue("ratioHighLimitAmount", RatioHighLimitAmount); - if (Comparator != null) yield return new ElementValue("comparator", Comparator); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2620,7 +2330,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2651,7 +2361,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SubstanceDefinition is not null) yield return new KeyValuePair("substanceDefinition",SubstanceDefinition); @@ -2806,35 +2516,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Genus != null) yield return Genus; - if (Species != null) yield return Species; - if (Part != null) yield return Part; - foreach (var elem in CountryOfOrigin) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Genus != null) yield return new ElementValue("genus", Genus); - if (Species != null) yield return new ElementValue("species", Species); - if (Part != null) yield return new ElementValue("part", Part); - foreach (var elem in CountryOfOrigin) { if (elem != null) yield return new ElementValue("countryOfOrigin", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2859,7 +2541,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2884,7 +2566,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -3388,73 +3070,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (Status != null) yield return Status; - foreach (var elem in Classification) { if (elem != null) yield return elem; } - if (Domain != null) yield return Domain; - foreach (var elem in Grade) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in InformationSource) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Manufacturer) { if (elem != null) yield return elem; } - foreach (var elem in Supplier) { if (elem != null) yield return elem; } - foreach (var elem in Moiety) { if (elem != null) yield return elem; } - foreach (var elem in Characterization) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - if (ReferenceInformation != null) yield return ReferenceInformation; - foreach (var elem in MolecularWeight) { if (elem != null) yield return elem; } - if (Structure != null) yield return Structure; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - if (NucleicAcid != null) yield return NucleicAcid; - if (Polymer != null) yield return Polymer; - if (Protein != null) yield return Protein; - if (SourceMaterial != null) yield return SourceMaterial; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (Status != null) yield return new ElementValue("status", Status); - foreach (var elem in Classification) { if (elem != null) yield return new ElementValue("classification", elem); } - if (Domain != null) yield return new ElementValue("domain", Domain); - foreach (var elem in Grade) { if (elem != null) yield return new ElementValue("grade", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in InformationSource) { if (elem != null) yield return new ElementValue("informationSource", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Manufacturer) { if (elem != null) yield return new ElementValue("manufacturer", elem); } - foreach (var elem in Supplier) { if (elem != null) yield return new ElementValue("supplier", elem); } - foreach (var elem in Moiety) { if (elem != null) yield return new ElementValue("moiety", elem); } - foreach (var elem in Characterization) { if (elem != null) yield return new ElementValue("characterization", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - if (ReferenceInformation != null) yield return new ElementValue("referenceInformation", ReferenceInformation); - foreach (var elem in MolecularWeight) { if (elem != null) yield return new ElementValue("molecularWeight", elem); } - if (Structure != null) yield return new ElementValue("structure", Structure); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - if (NucleicAcid != null) yield return new ElementValue("nucleicAcid", NucleicAcid); - if (Polymer != null) yield return new ElementValue("polymer", Polymer); - if (Protein != null) yield return new ElementValue("protein", Protein); - if (SourceMaterial != null) yield return new ElementValue("sourceMaterial", SourceMaterial); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3536,7 +3152,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3618,7 +3234,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs index eaa7334187..e9dcc13f02 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceNucleicAcid.cs @@ -292,41 +292,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SubunitElement != null) yield return SubunitElement; - if (SequenceElement != null) yield return SequenceElement; - if (LengthElement != null) yield return LengthElement; - if (SequenceAttachment != null) yield return SequenceAttachment; - if (FivePrime != null) yield return FivePrime; - if (ThreePrime != null) yield return ThreePrime; - foreach (var elem in Linkage) { if (elem != null) yield return elem; } - foreach (var elem in Sugar) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SubunitElement != null) yield return new ElementValue("subunit", SubunitElement); - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (LengthElement != null) yield return new ElementValue("length", LengthElement); - if (SequenceAttachment != null) yield return new ElementValue("sequenceAttachment", SequenceAttachment); - if (FivePrime != null) yield return new ElementValue("fivePrime", FivePrime); - if (ThreePrime != null) yield return new ElementValue("threePrime", ThreePrime); - foreach (var elem in Linkage) { if (elem != null) yield return new ElementValue("linkage", elem); } - foreach (var elem in Sugar) { if (elem != null) yield return new ElementValue("sugar", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -360,7 +326,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -394,7 +360,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SubunitElement is not null) yield return new KeyValuePair("subunit",SubunitElement); @@ -579,33 +545,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ConnectivityElement != null) yield return ConnectivityElement; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (ResidueSiteElement != null) yield return ResidueSiteElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ConnectivityElement != null) yield return new ElementValue("connectivity", ConnectivityElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ResidueSiteElement != null) yield return new ElementValue("residueSite", ResidueSiteElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -627,7 +567,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -649,7 +589,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ConnectivityElement is not null) yield return new KeyValuePair("connectivity",ConnectivityElement); @@ -796,31 +736,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (ResidueSiteElement != null) yield return ResidueSiteElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ResidueSiteElement != null) yield return new ElementValue("residueSite", ResidueSiteElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -839,7 +755,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -858,7 +774,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1024,35 +940,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceType != null) yield return SequenceType; - if (NumberOfSubunitsElement != null) yield return NumberOfSubunitsElement; - if (AreaOfHybridisationElement != null) yield return AreaOfHybridisationElement; - if (OligoNucleotideType != null) yield return OligoNucleotideType; - foreach (var elem in Subunit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceType != null) yield return new ElementValue("sequenceType", SequenceType); - if (NumberOfSubunitsElement != null) yield return new ElementValue("numberOfSubunits", NumberOfSubunitsElement); - if (AreaOfHybridisationElement != null) yield return new ElementValue("areaOfHybridisation", AreaOfHybridisationElement); - if (OligoNucleotideType != null) yield return new ElementValue("oligoNucleotideType", OligoNucleotideType); - foreach (var elem in Subunit) { if (elem != null) yield return new ElementValue("subunit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1077,7 +965,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1102,7 +990,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceType is not null) yield return new KeyValuePair("sequenceType",SequenceType); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs index 015d398d4c..df7448e508 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstancePolymer.cs @@ -141,29 +141,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RatioType != null) yield return RatioType; - foreach (var elem in StartingMaterial) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RatioType != null) yield return new ElementValue("ratioType", RatioType); - foreach (var elem in StartingMaterial) { if (elem != null) yield return new ElementValue("startingMaterial", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -179,7 +157,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -195,7 +173,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RatioType is not null) yield return new KeyValuePair("ratioType",RatioType); @@ -338,33 +316,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Category != null) yield return Category; - if (IsDefiningElement != null) yield return IsDefiningElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Category != null) yield return new ElementValue("category", Category); - if (IsDefiningElement != null) yield return new ElementValue("isDefining", IsDefiningElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -386,7 +338,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -408,7 +360,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -538,31 +490,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AverageMolecularFormulaElement != null) yield return AverageMolecularFormulaElement; - if (RepeatUnitAmountType != null) yield return RepeatUnitAmountType; - foreach (var elem in RepeatUnit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AverageMolecularFormulaElement != null) yield return new ElementValue("averageMolecularFormula", AverageMolecularFormulaElement); - if (RepeatUnitAmountType != null) yield return new ElementValue("repeatUnitAmountType", RepeatUnitAmountType); - foreach (var elem in RepeatUnit) { if (elem != null) yield return new ElementValue("repeatUnit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -581,7 +509,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -600,7 +528,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AverageMolecularFormulaElement is not null) yield return new KeyValuePair("averageMolecularFormula",AverageMolecularFormulaElement); @@ -780,35 +708,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UnitElement != null) yield return UnitElement; - if (Orientation != null) yield return Orientation; - if (AmountElement != null) yield return AmountElement; - foreach (var elem in DegreeOfPolymerisation) { if (elem != null) yield return elem; } - foreach (var elem in StructuralRepresentation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UnitElement != null) yield return new ElementValue("unit", UnitElement); - if (Orientation != null) yield return new ElementValue("orientation", Orientation); - if (AmountElement != null) yield return new ElementValue("amount", AmountElement); - foreach (var elem in DegreeOfPolymerisation) { if (elem != null) yield return new ElementValue("degreeOfPolymerisation", elem); } - foreach (var elem in StructuralRepresentation) { if (elem != null) yield return new ElementValue("structuralRepresentation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -833,7 +733,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -858,7 +758,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UnitElement is not null) yield return new KeyValuePair("unit",UnitElement); @@ -1040,33 +940,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (AverageElement != null) yield return AverageElement; - if (LowElement != null) yield return LowElement; - if (HighElement != null) yield return HighElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (AverageElement != null) yield return new ElementValue("average", AverageElement); - if (LowElement != null) yield return new ElementValue("low", LowElement); - if (HighElement != null) yield return new ElementValue("high", HighElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1088,7 +962,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1110,7 +984,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1255,33 +1129,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (RepresentationElement != null) yield return RepresentationElement; - if (Format != null) yield return Format; - if (Attachment != null) yield return Attachment; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (RepresentationElement != null) yield return new ElementValue("representation", RepresentationElement); - if (Format != null) yield return new ElementValue("format", Format); - if (Attachment != null) yield return new ElementValue("attachment", Attachment); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1303,7 +1151,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1325,7 +1173,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1510,39 +1358,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Class != null) yield return Class; - if (Geometry != null) yield return Geometry; - foreach (var elem in CopolymerConnectivity) { if (elem != null) yield return elem; } - if (ModificationElement != null) yield return ModificationElement; - foreach (var elem in MonomerSet) { if (elem != null) yield return elem; } - foreach (var elem in Repeat) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Class != null) yield return new ElementValue("class", Class); - if (Geometry != null) yield return new ElementValue("geometry", Geometry); - foreach (var elem in CopolymerConnectivity) { if (elem != null) yield return new ElementValue("copolymerConnectivity", elem); } - if (ModificationElement != null) yield return new ElementValue("modification", ModificationElement); - foreach (var elem in MonomerSet) { if (elem != null) yield return new ElementValue("monomerSet", elem); } - foreach (var elem in Repeat) { if (elem != null) yield return new ElementValue("repeat", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1573,7 +1389,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1604,7 +1420,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs index f53b6b2520..ffe511d7ea 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceProtein.cs @@ -326,41 +326,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SubunitElement != null) yield return SubunitElement; - if (SequenceElement != null) yield return SequenceElement; - if (LengthElement != null) yield return LengthElement; - if (SequenceAttachment != null) yield return SequenceAttachment; - if (NTerminalModificationId != null) yield return NTerminalModificationId; - if (NTerminalModificationElement != null) yield return NTerminalModificationElement; - if (CTerminalModificationId != null) yield return CTerminalModificationId; - if (CTerminalModificationElement != null) yield return CTerminalModificationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SubunitElement != null) yield return new ElementValue("subunit", SubunitElement); - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (LengthElement != null) yield return new ElementValue("length", LengthElement); - if (SequenceAttachment != null) yield return new ElementValue("sequenceAttachment", SequenceAttachment); - if (NTerminalModificationId != null) yield return new ElementValue("nTerminalModificationId", NTerminalModificationId); - if (NTerminalModificationElement != null) yield return new ElementValue("nTerminalModification", NTerminalModificationElement); - if (CTerminalModificationId != null) yield return new ElementValue("cTerminalModificationId", CTerminalModificationId); - if (CTerminalModificationElement != null) yield return new ElementValue("cTerminalModification", CTerminalModificationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -394,7 +360,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -428,7 +394,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SubunitElement is not null) yield return new KeyValuePair("subunit",SubunitElement); @@ -584,33 +550,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceType != null) yield return SequenceType; - if (NumberOfSubunitsElement != null) yield return NumberOfSubunitsElement; - foreach (var elem in DisulfideLinkageElement) { if (elem != null) yield return elem; } - foreach (var elem in Subunit) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceType != null) yield return new ElementValue("sequenceType", SequenceType); - if (NumberOfSubunitsElement != null) yield return new ElementValue("numberOfSubunits", NumberOfSubunitsElement); - foreach (var elem in DisulfideLinkageElement) { if (elem != null) yield return new ElementValue("disulfideLinkage", elem); } - foreach (var elem in Subunit) { if (elem != null) yield return new ElementValue("subunit", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -632,7 +572,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -654,7 +594,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceType is not null) yield return new KeyValuePair("sequenceType",SequenceType); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs index ae7662f21b..879540c476 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceReferenceInformation.cs @@ -159,31 +159,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (GeneSequenceOrigin != null) yield return GeneSequenceOrigin; - if (Gene != null) yield return Gene; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (GeneSequenceOrigin != null) yield return new ElementValue("geneSequenceOrigin", GeneSequenceOrigin); - if (Gene != null) yield return new ElementValue("gene", Gene); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -202,7 +178,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -221,7 +197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (GeneSequenceOrigin is not null) yield return new KeyValuePair("geneSequenceOrigin",GeneSequenceOrigin); @@ -334,31 +310,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Element != null) yield return Element; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Element != null) yield return new ElementValue("element", Element); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -377,7 +329,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -396,7 +348,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -591,41 +543,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Target != null) yield return Target; - if (Type != null) yield return Type; - if (Interaction != null) yield return Interaction; - if (Organism != null) yield return Organism; - if (OrganismType != null) yield return OrganismType; - if (Amount != null) yield return Amount; - if (AmountType != null) yield return AmountType; - foreach (var elem in Source) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Target != null) yield return new ElementValue("target", Target); - if (Type != null) yield return new ElementValue("type", Type); - if (Interaction != null) yield return new ElementValue("interaction", Interaction); - if (Organism != null) yield return new ElementValue("organism", Organism); - if (OrganismType != null) yield return new ElementValue("organismType", OrganismType); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (AmountType != null) yield return new ElementValue("amountType", AmountType); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -659,7 +577,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -693,7 +611,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target is not null) yield return new KeyValuePair("target",Target); @@ -832,33 +750,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CommentElement != null) yield return CommentElement; - foreach (var elem in Gene) { if (elem != null) yield return elem; } - foreach (var elem in GeneElement) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in Gene) { if (elem != null) yield return new ElementValue("gene", elem); } - foreach (var elem in GeneElement) { if (elem != null) yield return new ElementValue("geneElement", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -880,7 +772,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -902,7 +794,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CommentElement is not null) yield return new KeyValuePair("comment",CommentElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs b/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs index c27876c8f3..f45df90e56 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SubstanceSourceMaterial.cs @@ -158,29 +158,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FractionElement != null) yield return FractionElement; - if (MaterialType != null) yield return MaterialType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FractionElement != null) yield return new ElementValue("fraction", FractionElement); - if (MaterialType != null) yield return new ElementValue("materialType", MaterialType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -196,7 +174,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -212,7 +190,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FractionElement is not null) yield return new KeyValuePair("fraction",FractionElement); @@ -420,41 +398,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Family != null) yield return Family; - if (Genus != null) yield return Genus; - if (Species != null) yield return Species; - if (IntraspecificType != null) yield return IntraspecificType; - if (IntraspecificDescriptionElement != null) yield return IntraspecificDescriptionElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Hybrid != null) yield return Hybrid; - if (OrganismGeneral != null) yield return OrganismGeneral; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Family != null) yield return new ElementValue("family", Family); - if (Genus != null) yield return new ElementValue("genus", Genus); - if (Species != null) yield return new ElementValue("species", Species); - if (IntraspecificType != null) yield return new ElementValue("intraspecificType", IntraspecificType); - if (IntraspecificDescriptionElement != null) yield return new ElementValue("intraspecificDescription", IntraspecificDescriptionElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Hybrid != null) yield return new ElementValue("hybrid", Hybrid); - if (OrganismGeneral != null) yield return new ElementValue("organismGeneral", OrganismGeneral); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -488,7 +432,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -522,7 +466,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Family is not null) yield return new KeyValuePair("family",Family); @@ -639,29 +583,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AuthorType != null) yield return AuthorType; - if (AuthorDescriptionElement != null) yield return AuthorDescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AuthorType != null) yield return new ElementValue("authorType", AuthorType); - if (AuthorDescriptionElement != null) yield return new ElementValue("authorDescription", AuthorDescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -677,7 +599,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -693,7 +615,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AuthorType is not null) yield return new KeyValuePair("authorType",AuthorType); @@ -906,35 +828,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MaternalOrganismIdElement != null) yield return MaternalOrganismIdElement; - if (MaternalOrganismNameElement != null) yield return MaternalOrganismNameElement; - if (PaternalOrganismIdElement != null) yield return PaternalOrganismIdElement; - if (PaternalOrganismNameElement != null) yield return PaternalOrganismNameElement; - if (HybridType != null) yield return HybridType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MaternalOrganismIdElement != null) yield return new ElementValue("maternalOrganismId", MaternalOrganismIdElement); - if (MaternalOrganismNameElement != null) yield return new ElementValue("maternalOrganismName", MaternalOrganismNameElement); - if (PaternalOrganismIdElement != null) yield return new ElementValue("paternalOrganismId", PaternalOrganismIdElement); - if (PaternalOrganismNameElement != null) yield return new ElementValue("paternalOrganismName", PaternalOrganismNameElement); - if (HybridType != null) yield return new ElementValue("hybridType", HybridType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -959,7 +853,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -984,7 +878,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MaternalOrganismIdElement is not null) yield return new KeyValuePair("maternalOrganismId",MaternalOrganismIdElement); @@ -1112,33 +1006,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Kingdom != null) yield return Kingdom; - if (Phylum != null) yield return Phylum; - if (Class != null) yield return Class; - if (Order != null) yield return Order; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Kingdom != null) yield return new ElementValue("kingdom", Kingdom); - if (Phylum != null) yield return new ElementValue("phylum", Phylum); - if (Class != null) yield return new ElementValue("class", Class); - if (Order != null) yield return new ElementValue("order", Order); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1160,7 +1028,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1182,7 +1050,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Kingdom is not null) yield return new KeyValuePair("kingdom",Kingdom); @@ -1277,29 +1145,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Part != null) yield return Part; - if (PartLocation != null) yield return PartLocation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Part != null) yield return new ElementValue("part", Part); - if (PartLocation != null) yield return new ElementValue("partLocation", PartLocation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1315,7 +1161,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1331,7 +1177,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Part is not null) yield return new KeyValuePair("part",Part); @@ -1647,51 +1493,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceMaterialClass != null) yield return SourceMaterialClass; - if (SourceMaterialType != null) yield return SourceMaterialType; - if (SourceMaterialState != null) yield return SourceMaterialState; - if (OrganismId != null) yield return OrganismId; - if (OrganismNameElement != null) yield return OrganismNameElement; - foreach (var elem in ParentSubstanceId) { if (elem != null) yield return elem; } - foreach (var elem in ParentSubstanceNameElement) { if (elem != null) yield return elem; } - foreach (var elem in CountryOfOrigin) { if (elem != null) yield return elem; } - foreach (var elem in GeographicalLocationElement) { if (elem != null) yield return elem; } - if (DevelopmentStage != null) yield return DevelopmentStage; - foreach (var elem in FractionDescription) { if (elem != null) yield return elem; } - if (Organism != null) yield return Organism; - foreach (var elem in PartDescription) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceMaterialClass != null) yield return new ElementValue("sourceMaterialClass", SourceMaterialClass); - if (SourceMaterialType != null) yield return new ElementValue("sourceMaterialType", SourceMaterialType); - if (SourceMaterialState != null) yield return new ElementValue("sourceMaterialState", SourceMaterialState); - if (OrganismId != null) yield return new ElementValue("organismId", OrganismId); - if (OrganismNameElement != null) yield return new ElementValue("organismName", OrganismNameElement); - foreach (var elem in ParentSubstanceId) { if (elem != null) yield return new ElementValue("parentSubstanceId", elem); } - foreach (var elem in ParentSubstanceNameElement) { if (elem != null) yield return new ElementValue("parentSubstanceName", elem); } - foreach (var elem in CountryOfOrigin) { if (elem != null) yield return new ElementValue("countryOfOrigin", elem); } - foreach (var elem in GeographicalLocationElement) { if (elem != null) yield return new ElementValue("geographicalLocation", elem); } - if (DevelopmentStage != null) yield return new ElementValue("developmentStage", DevelopmentStage); - foreach (var elem in FractionDescription) { if (elem != null) yield return new ElementValue("fractionDescription", elem); } - if (Organism != null) yield return new ElementValue("organism", Organism); - foreach (var elem in PartDescription) { if (elem != null) yield return new ElementValue("partDescription", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1740,7 +1542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1789,7 +1591,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceMaterialClass is not null) yield return new KeyValuePair("sourceMaterialClass",SourceMaterialClass); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs index 9d1e949242..d178637c4c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SupplyDelivery.cs @@ -212,29 +212,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -250,7 +228,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -266,7 +244,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -532,47 +510,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (Type != null) yield return Type; - foreach (var elem in SuppliedItem) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - if (Supplier != null) yield return Supplier; - if (Destination != null) yield return Destination; - foreach (var elem in Receiver) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in SuppliedItem) { if (elem != null) yield return new ElementValue("suppliedItem", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (Supplier != null) yield return new ElementValue("supplier", Supplier); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Receiver) { if (elem != null) yield return new ElementValue("receiver", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -615,7 +553,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -658,7 +596,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs index 50a5ca5734..23bd0cf7ad 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/SupplyRequest.cs @@ -201,29 +201,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -239,7 +217,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -255,7 +233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -643,57 +621,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (Category != null) yield return Category; - if (PriorityElement != null) yield return PriorityElement; - if (DeliverFor != null) yield return DeliverFor; - if (Item != null) yield return Item; - if (Quantity != null) yield return Quantity; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - foreach (var elem in Supplier) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (DeliverFrom != null) yield return DeliverFrom; - if (DeliverTo != null) yield return DeliverTo; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (Category != null) yield return new ElementValue("category", Category); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DeliverFor != null) yield return new ElementValue("deliverFor", DeliverFor); - if (Item != null) yield return new ElementValue("item", Item); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in Supplier) { if (elem != null) yield return new ElementValue("supplier", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (DeliverFrom != null) yield return new ElementValue("deliverFrom", DeliverFrom); - if (DeliverTo != null) yield return new ElementValue("deliverTo", DeliverTo); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -751,7 +679,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -809,7 +737,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Task.cs b/src/Hl7.Fhir.R5/Model/Generated/Task.cs index 4f86e3763a..be6e2fb7c3 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Task.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Task.cs @@ -293,29 +293,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Function != null) yield return Function; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Function != null) yield return new ElementValue("function", Function); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -331,7 +309,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -347,7 +325,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Function is not null) yield return new KeyValuePair("function",Function); @@ -481,31 +459,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RepetitionsElement != null) yield return RepetitionsElement; - if (Period != null) yield return Period; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RepetitionsElement != null) yield return new ElementValue("repetitions", RepetitionsElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -524,7 +478,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -543,7 +497,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RepetitionsElement is not null) yield return new KeyValuePair("repetitions",RepetitionsElement); @@ -645,29 +599,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -683,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -699,7 +631,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -800,29 +732,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -838,7 +748,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -854,7 +764,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1638,91 +1548,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (InstantiatesCanonicalElement != null) yield return InstantiatesCanonicalElement; - if (InstantiatesUriElement != null) yield return InstantiatesUriElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (BusinessStatus != null) yield return BusinessStatus; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Focus != null) yield return Focus; - if (For != null) yield return For; - if (Encounter != null) yield return Encounter; - if (RequestedPeriod != null) yield return RequestedPeriod; - if (ExecutionPeriod != null) yield return ExecutionPeriod; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (LastModifiedElement != null) yield return LastModifiedElement; - if (Requester != null) yield return Requester; - foreach (var elem in RequestedPerformer) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - if (Restriction != null) yield return Restriction; - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (InstantiatesCanonicalElement != null) yield return new ElementValue("instantiatesCanonical", InstantiatesCanonicalElement); - if (InstantiatesUriElement != null) yield return new ElementValue("instantiatesUri", InstantiatesUriElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (BusinessStatus != null) yield return new ElementValue("businessStatus", BusinessStatus); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Focus != null) yield return new ElementValue("focus", Focus); - if (For != null) yield return new ElementValue("for", For); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (RequestedPeriod != null) yield return new ElementValue("requestedPeriod", RequestedPeriod); - if (ExecutionPeriod != null) yield return new ElementValue("executionPeriod", ExecutionPeriod); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (LastModifiedElement != null) yield return new ElementValue("lastModified", LastModifiedElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in RequestedPerformer) { if (elem != null) yield return new ElementValue("requestedPerformer", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - if (Restriction != null) yield return new ElementValue("restriction", Restriction); - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1831,7 +1657,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1940,7 +1766,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs b/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs index 964e3264e6..389ed3e826 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TerminologyCapabilities.cs @@ -211,29 +211,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -249,7 +227,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -265,7 +243,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -398,29 +376,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -436,7 +392,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -452,7 +408,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -639,33 +595,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UriElement != null) yield return UriElement; - foreach (var elem in Version) { if (elem != null) yield return elem; } - if (ContentElement != null) yield return ContentElement; - if (SubsumptionElement != null) yield return SubsumptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UriElement != null) yield return new ElementValue("uri", UriElement); - foreach (var elem in Version) { if (elem != null) yield return new ElementValue("version", elem); } - if (ContentElement != null) yield return new ElementValue("content", ContentElement); - if (SubsumptionElement != null) yield return new ElementValue("subsumption", SubsumptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -687,7 +617,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -709,7 +639,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UriElement is not null) yield return new KeyValuePair("uri",UriElement); @@ -967,37 +897,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (IsDefaultElement != null) yield return IsDefaultElement; - if (CompositionalElement != null) yield return CompositionalElement; - foreach (var elem in LanguageElement) { if (elem != null) yield return elem; } - foreach (var elem in Filter) { if (elem != null) yield return elem; } - foreach (var elem in PropertyElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (IsDefaultElement != null) yield return new ElementValue("isDefault", IsDefaultElement); - if (CompositionalElement != null) yield return new ElementValue("compositional", CompositionalElement); - foreach (var elem in LanguageElement) { if (elem != null) yield return new ElementValue("language", elem); } - foreach (var elem in Filter) { if (elem != null) yield return new ElementValue("filter", elem); } - foreach (var elem in PropertyElement) { if (elem != null) yield return new ElementValue("property", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1025,7 +925,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1053,7 +953,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1188,29 +1088,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in OpElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in OpElement) { if (elem != null) yield return new ElementValue("op", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1226,7 +1104,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1242,7 +1120,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1456,35 +1334,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (HierarchicalElement != null) yield return HierarchicalElement; - if (PagingElement != null) yield return PagingElement; - if (IncompleteElement != null) yield return IncompleteElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - if (TextFilterElement != null) yield return TextFilterElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (HierarchicalElement != null) yield return new ElementValue("hierarchical", HierarchicalElement); - if (PagingElement != null) yield return new ElementValue("paging", PagingElement); - if (IncompleteElement != null) yield return new ElementValue("incomplete", IncompleteElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - if (TextFilterElement != null) yield return new ElementValue("textFilter", TextFilterElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1509,7 +1359,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1534,7 +1384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (HierarchicalElement is not null) yield return new KeyValuePair("hierarchical",HierarchicalElement); @@ -1667,29 +1517,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1705,7 +1533,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1721,7 +1549,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1817,27 +1645,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TranslationsElement != null) yield return TranslationsElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TranslationsElement != null) yield return new ElementValue("translations", TranslationsElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1850,7 +1658,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1863,7 +1671,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TranslationsElement is not null) yield return new KeyValuePair("translations",TranslationsElement); @@ -1958,27 +1766,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NeedsMapElement != null) yield return NeedsMapElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NeedsMapElement != null) yield return new ElementValue("needsMap", NeedsMapElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1991,7 +1779,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2004,7 +1792,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NeedsMapElement is not null) yield return new KeyValuePair("needsMap",NeedsMapElement); @@ -2101,27 +1889,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TranslationElement != null) yield return TranslationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TranslationElement != null) yield return new ElementValue("translation", TranslationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2134,7 +1902,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2147,7 +1915,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TranslationElement is not null) yield return new KeyValuePair("translation",TranslationElement); @@ -2915,79 +2683,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - if (KindElement != null) yield return KindElement; - if (Software != null) yield return Software; - if (Implementation != null) yield return Implementation; - if (LockedDateElement != null) yield return LockedDateElement; - foreach (var elem in CodeSystem) { if (elem != null) yield return elem; } - if (Expansion != null) yield return Expansion; - if (CodeSearchElement != null) yield return CodeSearchElement; - if (ValidateCode != null) yield return ValidateCode; - if (Translation != null) yield return Translation; - if (Closure != null) yield return Closure; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Software != null) yield return new ElementValue("software", Software); - if (Implementation != null) yield return new ElementValue("implementation", Implementation); - if (LockedDateElement != null) yield return new ElementValue("lockedDate", LockedDateElement); - foreach (var elem in CodeSystem) { if (elem != null) yield return new ElementValue("codeSystem", elem); } - if (Expansion != null) yield return new ElementValue("expansion", Expansion); - if (CodeSearchElement != null) yield return new ElementValue("codeSearch", CodeSearchElement); - if (ValidateCode != null) yield return new ElementValue("validateCode", ValidateCode); - if (Translation != null) yield return new ElementValue("translation", Translation); - if (Closure != null) yield return new ElementValue("closure", Closure); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3078,7 +2774,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3169,7 +2865,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs b/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs index e2a5a25651..01b5a11472 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TestPlan.cs @@ -164,29 +164,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Predecessor != null) yield return Predecessor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Predecessor != null) yield return new ElementValue("predecessor", Predecessor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -202,7 +180,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -218,7 +196,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -401,37 +379,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in Scope) { if (elem != null) yield return elem; } - foreach (var elem in Dependency) { if (elem != null) yield return elem; } - foreach (var elem in TestRun) { if (elem != null) yield return elem; } - foreach (var elem in TestData) { if (elem != null) yield return elem; } - foreach (var elem in Assertion) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in Scope) { if (elem != null) yield return new ElementValue("scope", elem); } - foreach (var elem in Dependency) { if (elem != null) yield return new ElementValue("dependency", elem); } - foreach (var elem in TestRun) { if (elem != null) yield return new ElementValue("testRun", elem); } - foreach (var elem in TestData) { if (elem != null) yield return new ElementValue("testData", elem); } - foreach (var elem in Assertion) { if (elem != null) yield return new ElementValue("assertion", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -459,7 +407,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -487,7 +435,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -605,29 +553,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Predecessor != null) yield return Predecessor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Predecessor != null) yield return new ElementValue("predecessor", Predecessor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -643,7 +569,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -659,7 +585,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -770,29 +696,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NarrativeElement != null) yield return NarrativeElement; - if (Script != null) yield return Script; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NarrativeElement != null) yield return new ElementValue("narrative", NarrativeElement); - if (Script != null) yield return new ElementValue("script", Script); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -808,7 +712,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -824,7 +728,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NarrativeElement is not null) yield return new KeyValuePair("narrative",NarrativeElement); @@ -919,29 +823,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (Source != null) yield return Source; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (Source != null) yield return new ElementValue("source", Source); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -957,7 +839,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -973,7 +855,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -1085,31 +967,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Content != null) yield return Content; - if (Source != null) yield return Source; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Content != null) yield return new ElementValue("content", Content); - if (Source != null) yield return new ElementValue("source", Source); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1128,7 +986,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1147,7 +1005,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1263,31 +1121,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Object) { if (elem != null) yield return elem; } - foreach (var elem in Result) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Object) { if (elem != null) yield return new ElementValue("object", elem); } - foreach (var elem in Result) { if (elem != null) yield return new ElementValue("result", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1306,7 +1140,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1325,7 +1159,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -2011,71 +1845,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Scope) { if (elem != null) yield return elem; } - if (TestToolsElement != null) yield return TestToolsElement; - foreach (var elem in Dependency) { if (elem != null) yield return elem; } - if (ExitCriteriaElement != null) yield return ExitCriteriaElement; - foreach (var elem in TestCase) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Scope) { if (elem != null) yield return new ElementValue("scope", elem); } - if (TestToolsElement != null) yield return new ElementValue("testTools", TestToolsElement); - foreach (var elem in Dependency) { if (elem != null) yield return new ElementValue("dependency", elem); } - if (ExitCriteriaElement != null) yield return new ElementValue("exitCriteria", ExitCriteriaElement); - foreach (var elem in TestCase) { if (elem != null) yield return new ElementValue("testCase", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2154,7 +1924,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2233,7 +2003,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs b/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs index b0490e5dcb..acfa964c34 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TestReport.cs @@ -353,31 +353,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (UriElement != null) yield return UriElement; - if (DisplayElement != null) yield return DisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -396,7 +372,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -415,7 +391,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -494,27 +470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -527,7 +483,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -540,7 +496,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -636,29 +592,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -674,7 +608,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -690,7 +624,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -859,31 +793,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResultElement != null) yield return ResultElement; - if (MessageElement != null) yield return MessageElement; - if (DetailElement != null) yield return DetailElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -902,7 +812,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -921,7 +831,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResultElement is not null) yield return new KeyValuePair("result",ResultElement); @@ -1108,33 +1018,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResultElement != null) yield return ResultElement; - if (MessageElement != null) yield return MessageElement; - if (DetailElement != null) yield return DetailElement; - foreach (var elem in Requirement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - foreach (var elem in Requirement) { if (elem != null) yield return new ElementValue("requirement", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1156,7 +1040,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1178,7 +1062,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResultElement is not null) yield return new KeyValuePair("result",ResultElement); @@ -1263,27 +1147,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Link != null) yield return Link; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Link != null) yield return new ElementValue("link", Link); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1296,7 +1160,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1309,7 +1173,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Link is not null) yield return new KeyValuePair("link",Link); @@ -1454,31 +1318,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1497,7 +1337,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1516,7 +1356,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1614,29 +1454,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1652,7 +1470,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1668,7 +1486,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -1749,27 +1567,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1782,7 +1580,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1795,7 +1593,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -1876,27 +1674,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1909,7 +1687,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1922,7 +1700,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -2298,49 +2076,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (TestScriptElement != null) yield return TestScriptElement; - if (ResultElement != null) yield return ResultElement; - if (ScoreElement != null) yield return ScoreElement; - if (TesterElement != null) yield return TesterElement; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Setup != null) yield return Setup; - foreach (var elem in Test) { if (elem != null) yield return elem; } - if (Teardown != null) yield return Teardown; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TestScriptElement != null) yield return new ElementValue("testScript", TestScriptElement); - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (ScoreElement != null) yield return new ElementValue("score", ScoreElement); - if (TesterElement != null) yield return new ElementValue("tester", TesterElement); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Setup != null) yield return new ElementValue("setup", Setup); - foreach (var elem in Test) { if (elem != null) yield return new ElementValue("test", elem); } - if (Teardown != null) yield return new ElementValue("teardown", Teardown); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2386,7 +2122,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2432,7 +2168,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs b/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs index d67360c274..d701a8e482 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TestScript.cs @@ -666,31 +666,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IndexElement != null) yield return IndexElement; - if (Profile != null) yield return Profile; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IndexElement != null) yield return new ElementValue("index", IndexElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -709,7 +685,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -728,7 +704,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IndexElement is not null) yield return new KeyValuePair("index",IndexElement); @@ -881,31 +857,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IndexElement != null) yield return IndexElement; - if (Profile != null) yield return Profile; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IndexElement != null) yield return new ElementValue("index", IndexElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -924,7 +876,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -943,7 +895,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IndexElement is not null) yield return new KeyValuePair("index",IndexElement); @@ -1042,29 +994,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Link) { if (elem != null) yield return elem; } - foreach (var elem in Capability) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - foreach (var elem in Capability) { if (elem != null) yield return new ElementValue("capability", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1080,7 +1010,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1096,7 +1026,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Link?.Any() == true) yield return new KeyValuePair("link",Link); @@ -1229,29 +1159,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1267,7 +1175,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1283,7 +1191,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); @@ -1591,39 +1499,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RequiredElement != null) yield return RequiredElement; - if (ValidatedElement != null) yield return ValidatedElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in OriginElement) { if (elem != null) yield return elem; } - if (DestinationElement != null) yield return DestinationElement; - foreach (var elem in LinkElement) { if (elem != null) yield return elem; } - if (CapabilitiesElement != null) yield return CapabilitiesElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (ValidatedElement != null) yield return new ElementValue("validated", ValidatedElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in OriginElement) { if (elem != null) yield return new ElementValue("origin", elem); } - if (DestinationElement != null) yield return new ElementValue("destination", DestinationElement); - foreach (var elem in LinkElement) { if (elem != null) yield return new ElementValue("link", elem); } - if (CapabilitiesElement != null) yield return new ElementValue("capabilities", CapabilitiesElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1654,7 +1530,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1685,7 +1561,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RequiredElement is not null) yield return new KeyValuePair("required",RequiredElement); @@ -1823,31 +1699,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ArtifactElement != null) yield return ArtifactElement; - if (Conformance != null) yield return Conformance; - if (Phase != null) yield return Phase; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ArtifactElement != null) yield return new ElementValue("artifact", ArtifactElement); - if (Conformance != null) yield return new ElementValue("conformance", Conformance); - if (Phase != null) yield return new ElementValue("phase", Phase); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1866,7 +1718,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1885,7 +1737,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ArtifactElement is not null) yield return new KeyValuePair("artifact",ArtifactElement); @@ -2038,31 +1890,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AutocreateElement != null) yield return AutocreateElement; - if (AutodeleteElement != null) yield return AutodeleteElement; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AutocreateElement != null) yield return new ElementValue("autocreate", AutocreateElement); - if (AutodeleteElement != null) yield return new ElementValue("autodelete", AutodeleteElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2081,7 +1909,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2100,7 +1928,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AutocreateElement is not null) yield return new KeyValuePair("autocreate",AutocreateElement); @@ -2439,41 +2267,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DefaultValueElement != null) yield return DefaultValueElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (HeaderFieldElement != null) yield return HeaderFieldElement; - if (HintElement != null) yield return HintElement; - if (PathElement != null) yield return PathElement; - if (SourceIdElement != null) yield return SourceIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DefaultValueElement != null) yield return new ElementValue("defaultValue", DefaultValueElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (HeaderFieldElement != null) yield return new ElementValue("headerField", HeaderFieldElement); - if (HintElement != null) yield return new ElementValue("hint", HintElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2507,7 +2301,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2541,7 +2335,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2625,27 +2419,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2658,7 +2432,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2671,7 +2445,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -2767,29 +2541,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2805,7 +2557,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2821,7 +2573,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -3435,59 +3187,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ResourceElement != null) yield return ResourceElement; - if (LabelElement != null) yield return LabelElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (AcceptElement != null) yield return AcceptElement; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (DestinationElement != null) yield return DestinationElement; - if (EncodeRequestUrlElement != null) yield return EncodeRequestUrlElement; - if (MethodElement != null) yield return MethodElement; - if (OriginElement != null) yield return OriginElement; - if (ParamsElement != null) yield return ParamsElement; - foreach (var elem in RequestHeader) { if (elem != null) yield return elem; } - if (RequestIdElement != null) yield return RequestIdElement; - if (ResponseIdElement != null) yield return ResponseIdElement; - if (SourceIdElement != null) yield return SourceIdElement; - if (TargetIdElement != null) yield return TargetIdElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (AcceptElement != null) yield return new ElementValue("accept", AcceptElement); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (DestinationElement != null) yield return new ElementValue("destination", DestinationElement); - if (EncodeRequestUrlElement != null) yield return new ElementValue("encodeRequestUrl", EncodeRequestUrlElement); - if (MethodElement != null) yield return new ElementValue("method", MethodElement); - if (OriginElement != null) yield return new ElementValue("origin", OriginElement); - if (ParamsElement != null) yield return new ElementValue("params", ParamsElement); - foreach (var elem in RequestHeader) { if (elem != null) yield return new ElementValue("requestHeader", elem); } - if (RequestIdElement != null) yield return new ElementValue("requestId", RequestIdElement); - if (ResponseIdElement != null) yield return new ElementValue("responseId", ResponseIdElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - if (TargetIdElement != null) yield return new ElementValue("targetId", TargetIdElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3548,7 +3248,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3609,7 +3309,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -3759,29 +3459,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FieldElement != null) yield return FieldElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FieldElement != null) yield return new ElementValue("field", FieldElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3797,7 +3475,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3813,7 +3491,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FieldElement is not null) yield return new KeyValuePair("field",FieldElement); @@ -4725,75 +4403,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LabelElement != null) yield return LabelElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (DirectionElement != null) yield return DirectionElement; - if (CompareToSourceIdElement != null) yield return CompareToSourceIdElement; - if (CompareToSourceExpressionElement != null) yield return CompareToSourceExpressionElement; - if (CompareToSourcePathElement != null) yield return CompareToSourcePathElement; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (DefaultManualCompletionElement != null) yield return DefaultManualCompletionElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (HeaderFieldElement != null) yield return HeaderFieldElement; - if (MinimumIdElement != null) yield return MinimumIdElement; - if (NavigationLinksElement != null) yield return NavigationLinksElement; - if (OperatorElement != null) yield return OperatorElement; - if (PathElement != null) yield return PathElement; - if (RequestMethodElement != null) yield return RequestMethodElement; - if (RequestURLElement != null) yield return RequestURLElement; - if (ResourceElement != null) yield return ResourceElement; - if (ResponseElement != null) yield return ResponseElement; - if (ResponseCodeElement != null) yield return ResponseCodeElement; - if (SourceIdElement != null) yield return SourceIdElement; - if (StopTestOnFailElement != null) yield return StopTestOnFailElement; - if (ValidateProfileIdElement != null) yield return ValidateProfileIdElement; - if (ValueElement != null) yield return ValueElement; - if (WarningOnlyElement != null) yield return WarningOnlyElement; - foreach (var elem in Requirement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (DirectionElement != null) yield return new ElementValue("direction", DirectionElement); - if (CompareToSourceIdElement != null) yield return new ElementValue("compareToSourceId", CompareToSourceIdElement); - if (CompareToSourceExpressionElement != null) yield return new ElementValue("compareToSourceExpression", CompareToSourceExpressionElement); - if (CompareToSourcePathElement != null) yield return new ElementValue("compareToSourcePath", CompareToSourcePathElement); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (DefaultManualCompletionElement != null) yield return new ElementValue("defaultManualCompletion", DefaultManualCompletionElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (HeaderFieldElement != null) yield return new ElementValue("headerField", HeaderFieldElement); - if (MinimumIdElement != null) yield return new ElementValue("minimumId", MinimumIdElement); - if (NavigationLinksElement != null) yield return new ElementValue("navigationLinks", NavigationLinksElement); - if (OperatorElement != null) yield return new ElementValue("operator", OperatorElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (RequestMethodElement != null) yield return new ElementValue("requestMethod", RequestMethodElement); - if (RequestURLElement != null) yield return new ElementValue("requestURL", RequestURLElement); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (ResponseElement != null) yield return new ElementValue("response", ResponseElement); - if (ResponseCodeElement != null) yield return new ElementValue("responseCode", ResponseCodeElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - if (StopTestOnFailElement != null) yield return new ElementValue("stopTestOnFail", StopTestOnFailElement); - if (ValidateProfileIdElement != null) yield return new ElementValue("validateProfileId", ValidateProfileIdElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (WarningOnlyElement != null) yield return new ElementValue("warningOnly", WarningOnlyElement); - foreach (var elem in Requirement) { if (elem != null) yield return new ElementValue("requirement", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4878,7 +4488,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4963,7 +4573,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LabelElement is not null) yield return new KeyValuePair("label",LabelElement); @@ -5069,27 +4679,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Link != null) yield return Link; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Link != null) yield return new ElementValue("link", Link); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5102,7 +4692,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5115,7 +4705,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Link is not null) yield return new KeyValuePair("link",Link); @@ -5260,31 +4850,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5303,7 +4869,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5322,7 +4888,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -5420,29 +4986,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5458,7 +5002,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5474,7 +5018,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -5555,27 +5099,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5588,7 +5112,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5601,7 +5125,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -5682,27 +5206,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5715,7 +5219,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5728,7 +5232,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -6461,79 +5965,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (VersionAlgorithm != null) yield return VersionAlgorithm; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CopyrightLabelElement != null) yield return CopyrightLabelElement; - foreach (var elem in Origin) { if (elem != null) yield return elem; } - foreach (var elem in Destination) { if (elem != null) yield return elem; } - if (Metadata != null) yield return Metadata; - foreach (var elem in Scope) { if (elem != null) yield return elem; } - foreach (var elem in Fixture) { if (elem != null) yield return elem; } - foreach (var elem in ProfileElement) { if (elem != null) yield return elem; } - foreach (var elem in Variable) { if (elem != null) yield return elem; } - if (Setup != null) yield return Setup; - foreach (var elem in Test) { if (elem != null) yield return elem; } - if (Teardown != null) yield return Teardown; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (VersionAlgorithm != null) yield return new ElementValue("versionAlgorithm", VersionAlgorithm); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CopyrightLabelElement != null) yield return new ElementValue("copyrightLabel", CopyrightLabelElement); - foreach (var elem in Origin) { if (elem != null) yield return new ElementValue("origin", elem); } - foreach (var elem in Destination) { if (elem != null) yield return new ElementValue("destination", elem); } - if (Metadata != null) yield return new ElementValue("metadata", Metadata); - foreach (var elem in Scope) { if (elem != null) yield return new ElementValue("scope", elem); } - foreach (var elem in Fixture) { if (elem != null) yield return new ElementValue("fixture", elem); } - foreach (var elem in ProfileElement) { if (elem != null) yield return new ElementValue("profile", elem); } - foreach (var elem in Variable) { if (elem != null) yield return new ElementValue("variable", elem); } - if (Setup != null) yield return new ElementValue("setup", Setup); - foreach (var elem in Test) { if (elem != null) yield return new ElementValue("test", elem); } - if (Teardown != null) yield return new ElementValue("teardown", Teardown); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6624,7 +6056,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6715,7 +6147,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Timing.cs b/src/Hl7.Fhir.R5/Model/Generated/Timing.cs index 46cafff927..dc4d68a823 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Timing.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Timing.cs @@ -845,55 +845,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Bounds != null) yield return Bounds; - if (CountElement != null) yield return CountElement; - if (CountMaxElement != null) yield return CountMaxElement; - if (DurationElement != null) yield return DurationElement; - if (DurationMaxElement != null) yield return DurationMaxElement; - if (DurationUnitElement != null) yield return DurationUnitElement; - if (FrequencyElement != null) yield return FrequencyElement; - if (FrequencyMaxElement != null) yield return FrequencyMaxElement; - if (PeriodElement != null) yield return PeriodElement; - if (PeriodMaxElement != null) yield return PeriodMaxElement; - if (PeriodUnitElement != null) yield return PeriodUnitElement; - foreach (var elem in DayOfWeekElement) { if (elem != null) yield return elem; } - foreach (var elem in TimeOfDayElement) { if (elem != null) yield return elem; } - foreach (var elem in WhenElement) { if (elem != null) yield return elem; } - if (OffsetElement != null) yield return OffsetElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Bounds != null) yield return new ElementValue("bounds", Bounds); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (CountMaxElement != null) yield return new ElementValue("countMax", CountMaxElement); - if (DurationElement != null) yield return new ElementValue("duration", DurationElement); - if (DurationMaxElement != null) yield return new ElementValue("durationMax", DurationMaxElement); - if (DurationUnitElement != null) yield return new ElementValue("durationUnit", DurationUnitElement); - if (FrequencyElement != null) yield return new ElementValue("frequency", FrequencyElement); - if (FrequencyMaxElement != null) yield return new ElementValue("frequencyMax", FrequencyMaxElement); - if (PeriodElement != null) yield return new ElementValue("period", PeriodElement); - if (PeriodMaxElement != null) yield return new ElementValue("periodMax", PeriodMaxElement); - if (PeriodUnitElement != null) yield return new ElementValue("periodUnit", PeriodUnitElement); - foreach (var elem in DayOfWeekElement) { if (elem != null) yield return new ElementValue("dayOfWeek", elem); } - foreach (var elem in TimeOfDayElement) { if (elem != null) yield return new ElementValue("timeOfDay", elem); } - foreach (var elem in WhenElement) { if (elem != null) yield return new ElementValue("when", elem); } - if (OffsetElement != null) yield return new ElementValue("offset", OffsetElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -948,7 +900,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1003,7 +955,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Bounds is not null) yield return new KeyValuePair("bounds",Bounds); @@ -1132,31 +1084,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in EventElement) { if (elem != null) yield return elem; } - if (Repeat != null) yield return Repeat; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in EventElement) { if (elem != null) yield return new ElementValue("event", elem); } - if (Repeat != null) yield return new ElementValue("repeat", Repeat); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1175,7 +1103,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1194,7 +1122,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (EventElement?.Any() == true) yield return new KeyValuePair("event",EventElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/Transport.cs b/src/Hl7.Fhir.R5/Model/Generated/Transport.cs index ee6113df0b..ac01456281 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/Transport.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/Transport.cs @@ -293,31 +293,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RepetitionsElement != null) yield return RepetitionsElement; - if (Period != null) yield return Period; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RepetitionsElement != null) yield return new ElementValue("repetitions", RepetitionsElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -336,7 +312,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -355,7 +331,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RepetitionsElement is not null) yield return new KeyValuePair("repetitions",RepetitionsElement); @@ -457,29 +433,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -495,7 +449,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -511,7 +465,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -612,29 +566,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -650,7 +582,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -666,7 +598,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1438,89 +1370,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (InstantiatesCanonicalElement != null) yield return InstantiatesCanonicalElement; - if (InstantiatesUriElement != null) yield return InstantiatesUriElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Focus != null) yield return Focus; - if (For != null) yield return For; - if (Encounter != null) yield return Encounter; - if (CompletionTimeElement != null) yield return CompletionTimeElement; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (LastModifiedElement != null) yield return LastModifiedElement; - if (Requester != null) yield return Requester; - foreach (var elem in PerformerType) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - if (Location != null) yield return Location; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - if (Restriction != null) yield return Restriction; - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - if (RequestedLocation != null) yield return RequestedLocation; - if (CurrentLocation != null) yield return CurrentLocation; - if (Reason != null) yield return Reason; - if (History != null) yield return History; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (InstantiatesCanonicalElement != null) yield return new ElementValue("instantiatesCanonical", InstantiatesCanonicalElement); - if (InstantiatesUriElement != null) yield return new ElementValue("instantiatesUri", InstantiatesUriElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Focus != null) yield return new ElementValue("focus", Focus); - if (For != null) yield return new ElementValue("for", For); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (CompletionTimeElement != null) yield return new ElementValue("completionTime", CompletionTimeElement); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (LastModifiedElement != null) yield return new ElementValue("lastModified", LastModifiedElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in PerformerType) { if (elem != null) yield return new ElementValue("performerType", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - if (Restriction != null) yield return new ElementValue("restriction", Restriction); - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - if (RequestedLocation != null) yield return new ElementValue("requestedLocation", RequestedLocation); - if (CurrentLocation != null) yield return new ElementValue("currentLocation", CurrentLocation); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (History != null) yield return new ElementValue("history", History); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1626,7 +1476,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1732,7 +1582,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs b/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs index cf2b696f2e..3b351aaebc 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/TriggerDefinition.cs @@ -330,39 +330,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - if (Code != null) yield return Code; - if (SubscriptionTopicElement != null) yield return SubscriptionTopicElement; - if (Timing != null) yield return Timing; - foreach (var elem in Data) { if (elem != null) yield return elem; } - if (Condition != null) yield return Condition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Code != null) yield return new ElementValue("code", Code); - if (SubscriptionTopicElement != null) yield return new ElementValue("subscriptionTopic", SubscriptionTopicElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - foreach (var elem in Data) { if (elem != null) yield return new ElementValue("data", elem); } - if (Condition != null) yield return new ElementValue("condition", Condition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -393,7 +361,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -424,7 +392,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs b/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs index bc3dffba68..cd8be6a3fe 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/VerificationResult.cs @@ -300,39 +300,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Who != null) yield return Who; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in CommunicationMethod) { if (elem != null) yield return elem; } - if (ValidationStatus != null) yield return ValidationStatus; - if (ValidationDateElement != null) yield return ValidationDateElement; - if (CanPushUpdates != null) yield return CanPushUpdates; - foreach (var elem in PushTypeAvailable) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Who != null) yield return new ElementValue("who", Who); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in CommunicationMethod) { if (elem != null) yield return new ElementValue("communicationMethod", elem); } - if (ValidationStatus != null) yield return new ElementValue("validationStatus", ValidationStatus); - if (ValidationDateElement != null) yield return new ElementValue("validationDate", ValidationDateElement); - if (CanPushUpdates != null) yield return new ElementValue("canPushUpdates", CanPushUpdates); - foreach (var elem in PushTypeAvailable) { if (elem != null) yield return new ElementValue("pushTypeAvailable", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -363,7 +331,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -394,7 +362,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Who is not null) yield return new KeyValuePair("who",Who); @@ -647,41 +615,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Who != null) yield return Who; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (CommunicationMethod != null) yield return CommunicationMethod; - if (DateElement != null) yield return DateElement; - if (SourceIdentityCertificateElement != null) yield return SourceIdentityCertificateElement; - if (ProxyIdentityCertificateElement != null) yield return ProxyIdentityCertificateElement; - if (ProxySignature != null) yield return ProxySignature; - if (SourceSignature != null) yield return SourceSignature; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Who != null) yield return new ElementValue("who", Who); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (CommunicationMethod != null) yield return new ElementValue("communicationMethod", CommunicationMethod); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (SourceIdentityCertificateElement != null) yield return new ElementValue("sourceIdentityCertificate", SourceIdentityCertificateElement); - if (ProxyIdentityCertificateElement != null) yield return new ElementValue("proxyIdentityCertificate", ProxyIdentityCertificateElement); - if (ProxySignature != null) yield return new ElementValue("proxySignature", ProxySignature); - if (SourceSignature != null) yield return new ElementValue("sourceSignature", SourceSignature); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -715,7 +649,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -749,7 +683,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Who is not null) yield return new KeyValuePair("who",Who); @@ -885,31 +819,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Organization != null) yield return Organization; - if (IdentityCertificateElement != null) yield return IdentityCertificateElement; - if (AttestationSignature != null) yield return AttestationSignature; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Organization != null) yield return new ElementValue("organization", Organization); - if (IdentityCertificateElement != null) yield return new ElementValue("identityCertificate", IdentityCertificateElement); - if (AttestationSignature != null) yield return new ElementValue("attestationSignature", AttestationSignature); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -928,7 +838,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -947,7 +857,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Organization is not null) yield return new KeyValuePair("organization",Organization); @@ -1324,53 +1234,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Target) { if (elem != null) yield return elem; } - foreach (var elem in TargetLocationElement) { if (elem != null) yield return elem; } - if (Need != null) yield return Need; - if (StatusElement != null) yield return StatusElement; - if (StatusDateElement != null) yield return StatusDateElement; - if (ValidationType != null) yield return ValidationType; - foreach (var elem in ValidationProcess) { if (elem != null) yield return elem; } - if (Frequency != null) yield return Frequency; - if (LastPerformedElement != null) yield return LastPerformedElement; - if (NextScheduledElement != null) yield return NextScheduledElement; - if (FailureAction != null) yield return FailureAction; - foreach (var elem in PrimarySource) { if (elem != null) yield return elem; } - if (Attestation != null) yield return Attestation; - foreach (var elem in Validator) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - foreach (var elem in TargetLocationElement) { if (elem != null) yield return new ElementValue("targetLocation", elem); } - if (Need != null) yield return new ElementValue("need", Need); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (ValidationType != null) yield return new ElementValue("validationType", ValidationType); - foreach (var elem in ValidationProcess) { if (elem != null) yield return new ElementValue("validationProcess", elem); } - if (Frequency != null) yield return new ElementValue("frequency", Frequency); - if (LastPerformedElement != null) yield return new ElementValue("lastPerformed", LastPerformedElement); - if (NextScheduledElement != null) yield return new ElementValue("nextScheduled", NextScheduledElement); - if (FailureAction != null) yield return new ElementValue("failureAction", FailureAction); - foreach (var elem in PrimarySource) { if (elem != null) yield return new ElementValue("primarySource", elem); } - if (Attestation != null) yield return new ElementValue("attestation", Attestation); - foreach (var elem in Validator) { if (elem != null) yield return new ElementValue("validator", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1422,7 +1286,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1474,7 +1338,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target?.Any() == true) yield return new KeyValuePair("target",Target); diff --git a/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs b/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs index 5debd6acc2..095182b19c 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/VirtualServiceDetail.cs @@ -233,35 +233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ChannelType != null) yield return ChannelType; - if (Address != null) yield return Address; - foreach (var elem in AdditionalInfoElement) { if (elem != null) yield return elem; } - if (MaxParticipantsElement != null) yield return MaxParticipantsElement; - if (SessionKeyElement != null) yield return SessionKeyElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ChannelType != null) yield return new ElementValue("channelType", ChannelType); - if (Address != null) yield return new ElementValue("address", Address); - foreach (var elem in AdditionalInfoElement) { if (elem != null) yield return new ElementValue("additionalInfo", elem); } - if (MaxParticipantsElement != null) yield return new ElementValue("maxParticipants", MaxParticipantsElement); - if (SessionKeyElement != null) yield return new ElementValue("sessionKey", SessionKeyElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -286,7 +258,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -311,7 +283,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ChannelType is not null) yield return new KeyValuePair("channelType",ChannelType); diff --git a/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs index d97523ed97..87efe3baa0 100644 --- a/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs +++ b/src/Hl7.Fhir.R5/Model/Generated/VisionPrescription.cs @@ -581,53 +581,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Product != null) yield return Product; - if (EyeElement != null) yield return EyeElement; - if (SphereElement != null) yield return SphereElement; - if (CylinderElement != null) yield return CylinderElement; - if (AxisElement != null) yield return AxisElement; - foreach (var elem in Prism) { if (elem != null) yield return elem; } - if (AddElement != null) yield return AddElement; - if (PowerElement != null) yield return PowerElement; - if (BackCurveElement != null) yield return BackCurveElement; - if (DiameterElement != null) yield return DiameterElement; - if (Duration != null) yield return Duration; - if (ColorElement != null) yield return ColorElement; - if (BrandElement != null) yield return BrandElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Product != null) yield return new ElementValue("product", Product); - if (EyeElement != null) yield return new ElementValue("eye", EyeElement); - if (SphereElement != null) yield return new ElementValue("sphere", SphereElement); - if (CylinderElement != null) yield return new ElementValue("cylinder", CylinderElement); - if (AxisElement != null) yield return new ElementValue("axis", AxisElement); - foreach (var elem in Prism) { if (elem != null) yield return new ElementValue("prism", elem); } - if (AddElement != null) yield return new ElementValue("add", AddElement); - if (PowerElement != null) yield return new ElementValue("power", PowerElement); - if (BackCurveElement != null) yield return new ElementValue("backCurve", BackCurveElement); - if (DiameterElement != null) yield return new ElementValue("diameter", DiameterElement); - if (Duration != null) yield return new ElementValue("duration", Duration); - if (ColorElement != null) yield return new ElementValue("color", ColorElement); - if (BrandElement != null) yield return new ElementValue("brand", BrandElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -679,7 +633,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -731,7 +685,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Product is not null) yield return new KeyValuePair("product",Product); @@ -879,29 +833,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AmountElement != null) yield return AmountElement; - if (BaseElement != null) yield return BaseElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AmountElement != null) yield return new ElementValue("amount", AmountElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -917,7 +849,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -933,7 +865,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AmountElement is not null) yield return new KeyValuePair("amount",AmountElement); @@ -1180,41 +1112,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CreatedElement != null) yield return CreatedElement; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (DateWrittenElement != null) yield return DateWrittenElement; - if (Prescriber != null) yield return Prescriber; - foreach (var elem in LensSpecification) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateWrittenElement != null) yield return new ElementValue("dateWritten", DateWrittenElement); - if (Prescriber != null) yield return new ElementValue("prescriber", Prescriber); - foreach (var elem in LensSpecification) { if (elem != null) yield return new ElementValue("lensSpecification", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1248,7 +1146,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1282,7 +1180,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Account.cs b/src/Hl7.Fhir.STU3/Model/Generated/Account.cs index 4832c9169d..975315b702 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Account.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Account.cs @@ -197,29 +197,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Coverage != null) yield return Coverage; - if (PriorityElement != null) yield return PriorityElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -235,7 +213,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -251,7 +229,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coverage is not null) yield return new KeyValuePair("coverage",Coverage); @@ -384,31 +362,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Party != null) yield return Party; - if (OnHoldElement != null) yield return OnHoldElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Party != null) yield return new ElementValue("party", Party); - if (OnHoldElement != null) yield return new ElementValue("onHold", OnHoldElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -427,7 +381,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -446,7 +400,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Party is not null) yield return new KeyValuePair("party",Party); @@ -753,49 +707,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (NameElement != null) yield return NameElement; - if (Subject != null) yield return Subject; - if (Period != null) yield return Period; - if (Active != null) yield return Active; - if (Balance != null) yield return Balance; - foreach (var elem in Coverage) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Guarantor) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Period != null) yield return new ElementValue("period", Period); - if (Active != null) yield return new ElementValue("active", Active); - if (Balance != null) yield return new ElementValue("balance", Balance); - foreach (var elem in Coverage) { if (elem != null) yield return new ElementValue("coverage", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Guarantor) { if (elem != null) yield return new ElementValue("guarantor", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -841,7 +753,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -887,7 +799,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs index 3a13d19e83..07b2f214ac 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ActivityDefinition.cs @@ -168,29 +168,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -206,7 +184,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -222,7 +200,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -422,33 +400,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (PathElement != null) yield return PathElement; - if (LanguageElement != null) yield return LanguageElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -470,7 +422,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -492,7 +444,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1391,93 +1343,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Library) { if (elem != null) yield return elem; } - if (KindElement != null) yield return KindElement; - if (Code != null) yield return Code; - if (Timing != null) yield return Timing; - if (Location != null) yield return Location; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Product != null) yield return Product; - if (Quantity != null) yield return Quantity; - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (Transform != null) yield return Transform; - foreach (var elem in DynamicValue) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Library) { if (elem != null) yield return new ElementValue("library", elem); } - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Product != null) yield return new ElementValue("product", Product); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (Transform != null) yield return new ElementValue("transform", Transform); - foreach (var elem in DynamicValue) { if (elem != null) yield return new ElementValue("dynamicValue", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1589,7 +1455,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1701,7 +1567,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Address.cs b/src/Hl7.Fhir.STU3/Model/Generated/Address.cs index 8f8382bd84..63ac21f1fe 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Address.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Address.cs @@ -488,45 +488,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (TypeElement != null) yield return TypeElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in LineElement) { if (elem != null) yield return elem; } - if (CityElement != null) yield return CityElement; - if (DistrictElement != null) yield return DistrictElement; - if (StateElement != null) yield return StateElement; - if (PostalCodeElement != null) yield return PostalCodeElement; - if (CountryElement != null) yield return CountryElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in LineElement) { if (elem != null) yield return new ElementValue("line", elem); } - if (CityElement != null) yield return new ElementValue("city", CityElement); - if (DistrictElement != null) yield return new ElementValue("district", DistrictElement); - if (StateElement != null) yield return new ElementValue("state", StateElement); - if (PostalCodeElement != null) yield return new ElementValue("postalCode", PostalCodeElement); - if (CountryElement != null) yield return new ElementValue("country", CountryElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -566,7 +528,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -606,7 +568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs b/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs index 64674076e8..834bfac15c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/AdverseEvent.cs @@ -362,39 +362,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Instance != null) yield return Instance; - if (CausalityElement != null) yield return CausalityElement; - if (CausalityAssessment != null) yield return CausalityAssessment; - if (CausalityProductRelatednessElement != null) yield return CausalityProductRelatednessElement; - if (CausalityMethod != null) yield return CausalityMethod; - if (CausalityAuthor != null) yield return CausalityAuthor; - if (CausalityResult != null) yield return CausalityResult; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Instance != null) yield return new ElementValue("instance", Instance); - if (CausalityElement != null) yield return new ElementValue("causality", CausalityElement); - if (CausalityAssessment != null) yield return new ElementValue("causalityAssessment", CausalityAssessment); - if (CausalityProductRelatednessElement != null) yield return new ElementValue("causalityProductRelatedness", CausalityProductRelatednessElement); - if (CausalityMethod != null) yield return new ElementValue("causalityMethod", CausalityMethod); - if (CausalityAuthor != null) yield return new ElementValue("causalityAuthor", CausalityAuthor); - if (CausalityResult != null) yield return new ElementValue("causalityResult", CausalityResult); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -425,7 +393,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -456,7 +424,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Instance is not null) yield return new KeyValuePair("instance",Instance); @@ -849,57 +817,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (CategoryElement != null) yield return CategoryElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (DateElement != null) yield return DateElement; - foreach (var elem in Reaction) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (Seriousness != null) yield return Seriousness; - if (Outcome != null) yield return Outcome; - if (Recorder != null) yield return Recorder; - if (EventParticipant != null) yield return EventParticipant; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in SuspectEntity) { if (elem != null) yield return elem; } - foreach (var elem in SubjectMedicalHistory) { if (elem != null) yield return elem; } - foreach (var elem in ReferenceDocument) { if (elem != null) yield return elem; } - foreach (var elem in Study) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Reaction) { if (elem != null) yield return new ElementValue("reaction", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (Seriousness != null) yield return new ElementValue("seriousness", Seriousness); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - if (EventParticipant != null) yield return new ElementValue("eventParticipant", EventParticipant); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in SuspectEntity) { if (elem != null) yield return new ElementValue("suspectEntity", elem); } - foreach (var elem in SubjectMedicalHistory) { if (elem != null) yield return new ElementValue("subjectMedicalHistory", elem); } - foreach (var elem in ReferenceDocument) { if (elem != null) yield return new ElementValue("referenceDocument", elem); } - foreach (var elem in Study) { if (elem != null) yield return new ElementValue("study", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -957,7 +875,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1015,7 +933,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs b/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs index a06d428679..0069b30397 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/AllergyIntolerance.cs @@ -462,39 +462,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Substance != null) yield return Substance; - foreach (var elem in Manifestation) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (OnsetElement != null) yield return OnsetElement; - if (SeverityElement != null) yield return SeverityElement; - if (ExposureRoute != null) yield return ExposureRoute; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Substance != null) yield return new ElementValue("substance", Substance); - foreach (var elem in Manifestation) { if (elem != null) yield return new ElementValue("manifestation", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (OnsetElement != null) yield return new ElementValue("onset", OnsetElement); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (ExposureRoute != null) yield return new ElementValue("exposureRoute", ExposureRoute); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -525,7 +493,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -556,7 +524,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Substance is not null) yield return new KeyValuePair("substance",Substance); @@ -1002,55 +970,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ClinicalStatusElement != null) yield return ClinicalStatusElement; - if (VerificationStatusElement != null) yield return VerificationStatusElement; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in CategoryElement) { if (elem != null) yield return elem; } - if (CriticalityElement != null) yield return CriticalityElement; - if (Code != null) yield return Code; - if (Patient != null) yield return Patient; - if (Onset != null) yield return Onset; - if (AssertedDateElement != null) yield return AssertedDateElement; - if (Recorder != null) yield return Recorder; - if (Asserter != null) yield return Asserter; - if (LastOccurrenceElement != null) yield return LastOccurrenceElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Reaction) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ClinicalStatusElement != null) yield return new ElementValue("clinicalStatus", ClinicalStatusElement); - if (VerificationStatusElement != null) yield return new ElementValue("verificationStatus", VerificationStatusElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in CategoryElement) { if (elem != null) yield return new ElementValue("category", elem); } - if (CriticalityElement != null) yield return new ElementValue("criticality", CriticalityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Onset != null) yield return new ElementValue("onset", Onset); - if (AssertedDateElement != null) yield return new ElementValue("assertedDate", AssertedDateElement); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - if (Asserter != null) yield return new ElementValue("asserter", Asserter); - if (LastOccurrenceElement != null) yield return new ElementValue("lastOccurrence", LastOccurrenceElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Reaction) { if (elem != null) yield return new ElementValue("reaction", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1105,7 +1025,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1160,7 +1080,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Annotation.cs b/src/Hl7.Fhir.STU3/Model/Generated/Annotation.cs index 58a350cf65..575dd1179e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Annotation.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Annotation.cs @@ -187,31 +187,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Author != null) yield return Author; - if (TimeElement != null) yield return TimeElement; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Author != null) yield return new ElementValue("author", Author); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -230,7 +206,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -249,7 +225,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Author is not null) yield return new KeyValuePair("author",Author); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs b/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs index 578aa01bc8..f404e496b6 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Appointment.cs @@ -306,33 +306,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Actor != null) yield return Actor; - if (RequiredElement != null) yield return RequiredElement; - if (StatusElement != null) yield return StatusElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Actor != null) yield return new ElementValue("actor", Actor); - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -354,7 +328,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -376,7 +350,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -918,65 +892,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ServiceCategory != null) yield return ServiceCategory; - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - if (AppointmentType != null) yield return AppointmentType; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Indication) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (MinutesDurationElement != null) yield return MinutesDurationElement; - foreach (var elem in Slot) { if (elem != null) yield return elem; } - if (CreatedElement != null) yield return CreatedElement; - if (CommentElement != null) yield return CommentElement; - foreach (var elem in IncomingReferral) { if (elem != null) yield return elem; } - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in RequestedPeriod) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ServiceCategory != null) yield return new ElementValue("serviceCategory", ServiceCategory); - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - if (AppointmentType != null) yield return new ElementValue("appointmentType", AppointmentType); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Indication) { if (elem != null) yield return new ElementValue("indication", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (MinutesDurationElement != null) yield return new ElementValue("minutesDuration", MinutesDurationElement); - foreach (var elem in Slot) { if (elem != null) yield return new ElementValue("slot", elem); } - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in IncomingReferral) { if (elem != null) yield return new ElementValue("incomingReferral", elem); } - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in RequestedPeriod) { if (elem != null) yield return new ElementValue("requestedPeriod", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1046,7 +962,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1116,7 +1032,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs index e3b2043074..7d016b6b1a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/AppointmentResponse.cs @@ -308,41 +308,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Appointment != null) yield return Appointment; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - foreach (var elem in ParticipantType) { if (elem != null) yield return elem; } - if (Actor != null) yield return Actor; - if (ParticipantStatusElement != null) yield return ParticipantStatusElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Appointment != null) yield return new ElementValue("appointment", Appointment); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - foreach (var elem in ParticipantType) { if (elem != null) yield return new ElementValue("participantType", elem); } - if (Actor != null) yield return new ElementValue("actor", Actor); - if (ParticipantStatusElement != null) yield return new ElementValue("participantStatus", ParticipantStatusElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -376,7 +342,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -410,7 +376,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs b/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs index c7e76a0029..5f2935a0f4 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/AuditEvent.cs @@ -490,47 +490,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Reference != null) yield return Reference; - if (UserId != null) yield return UserId; - if (AltIdElement != null) yield return AltIdElement; - if (NameElement != null) yield return NameElement; - if (RequestorElement != null) yield return RequestorElement; - if (Location != null) yield return Location; - foreach (var elem in PolicyElement) { if (elem != null) yield return elem; } - if (Media != null) yield return Media; - if (Network != null) yield return Network; - foreach (var elem in PurposeOfUse) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Reference != null) yield return new ElementValue("reference", Reference); - if (UserId != null) yield return new ElementValue("userId", UserId); - if (AltIdElement != null) yield return new ElementValue("altId", AltIdElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (RequestorElement != null) yield return new ElementValue("requestor", RequestorElement); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in PolicyElement) { if (elem != null) yield return new ElementValue("policy", elem); } - if (Media != null) yield return new ElementValue("media", Media); - if (Network != null) yield return new ElementValue("network", Network); - foreach (var elem in PurposeOfUse) { if (elem != null) yield return new ElementValue("purposeOfUse", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -573,7 +533,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -616,7 +576,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role?.Any() == true) yield return new KeyValuePair("role",Role); @@ -759,29 +719,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AddressElement != null) yield return AddressElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AddressElement != null) yield return new ElementValue("address", AddressElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -797,7 +735,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -813,7 +751,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AddressElement is not null) yield return new KeyValuePair("address",AddressElement); @@ -947,31 +885,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SiteElement != null) yield return SiteElement; - if (Identifier != null) yield return Identifier; - foreach (var elem in Type) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SiteElement != null) yield return new ElementValue("site", SiteElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -990,7 +904,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1009,7 +923,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SiteElement is not null) yield return new KeyValuePair("site",SiteElement); @@ -1297,45 +1211,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Reference != null) yield return Reference; - if (Type != null) yield return Type; - if (Role != null) yield return Role; - if (Lifecycle != null) yield return Lifecycle; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (QueryElement != null) yield return QueryElement; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Reference != null) yield return new ElementValue("reference", Reference); - if (Type != null) yield return new ElementValue("type", Type); - if (Role != null) yield return new ElementValue("role", Role); - if (Lifecycle != null) yield return new ElementValue("lifecycle", Lifecycle); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (QueryElement != null) yield return new ElementValue("query", QueryElement); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1375,7 +1251,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1415,7 +1291,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1557,29 +1433,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1595,7 +1449,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1611,7 +1465,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1905,45 +1759,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - foreach (var elem in Subtype) { if (elem != null) yield return elem; } - if (ActionElement != null) yield return ActionElement; - if (RecordedElement != null) yield return RecordedElement; - if (OutcomeElement != null) yield return OutcomeElement; - if (OutcomeDescElement != null) yield return OutcomeDescElement; - foreach (var elem in PurposeOfEvent) { if (elem != null) yield return elem; } - foreach (var elem in Agent) { if (elem != null) yield return elem; } - if (Source != null) yield return Source; - foreach (var elem in Entity) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Subtype) { if (elem != null) yield return new ElementValue("subtype", elem); } - if (ActionElement != null) yield return new ElementValue("action", ActionElement); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - if (OutcomeElement != null) yield return new ElementValue("outcome", OutcomeElement); - if (OutcomeDescElement != null) yield return new ElementValue("outcomeDesc", OutcomeDescElement); - foreach (var elem in PurposeOfEvent) { if (elem != null) yield return new ElementValue("purposeOfEvent", elem); } - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Entity) { if (elem != null) yield return new ElementValue("entity", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1983,7 +1799,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2023,7 +1839,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs b/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs index 5db6a2a893..6bbe5af353 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Basic.cs @@ -205,35 +205,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (CreatedElement != null) yield return CreatedElement; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -258,7 +230,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +255,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs b/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs index 2ed5c5c683..092fbea243 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/BodySite.cs @@ -256,39 +256,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Code != null) yield return Code; - foreach (var elem in Qualifier) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Image) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Qualifier) { if (elem != null) yield return new ElementValue("qualifier", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Image) { if (elem != null) yield return new ElementValue("image", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -319,7 +287,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -350,7 +318,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs index eabadf2588..b5a32b1c46 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CapabilityStatement.cs @@ -573,31 +573,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (VersionElement != null) yield return VersionElement; - if (ReleaseDateElement != null) yield return ReleaseDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (ReleaseDateElement != null) yield return new ElementValue("releaseDate", ReleaseDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -616,7 +592,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -635,7 +611,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -771,29 +747,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -809,7 +763,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -825,7 +779,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1080,41 +1034,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (Security != null) yield return Security; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - foreach (var elem in Interaction) { if (elem != null) yield return elem; } - foreach (var elem in SearchParam) { if (elem != null) yield return elem; } - foreach (var elem in Operation) { if (elem != null) yield return elem; } - foreach (var elem in CompartmentElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (Security != null) yield return new ElementValue("security", Security); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - foreach (var elem in Interaction) { if (elem != null) yield return new ElementValue("interaction", elem); } - foreach (var elem in SearchParam) { if (elem != null) yield return new ElementValue("searchParam", elem); } - foreach (var elem in Operation) { if (elem != null) yield return new ElementValue("operation", elem); } - foreach (var elem in CompartmentElement) { if (elem != null) yield return new ElementValue("compartment", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1148,7 +1068,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1182,7 +1102,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -1355,33 +1275,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CorsElement != null) yield return CorsElement; - foreach (var elem in Service) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Certificate) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CorsElement != null) yield return new ElementValue("cors", CorsElement); - foreach (var elem in Service) { if (elem != null) yield return new ElementValue("service", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Certificate) { if (elem != null) yield return new ElementValue("certificate", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1403,7 +1297,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1425,7 +1319,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CorsElement is not null) yield return new KeyValuePair("cors",CorsElement); @@ -1557,29 +1451,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (BlobElement != null) yield return BlobElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (BlobElement != null) yield return new ElementValue("blob", BlobElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1595,7 +1467,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1611,7 +1483,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2150,55 +2022,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Profile != null) yield return Profile; - if (DocumentationElement != null) yield return DocumentationElement; - foreach (var elem in Interaction) { if (elem != null) yield return elem; } - if (VersioningElement != null) yield return VersioningElement; - if (ReadHistoryElement != null) yield return ReadHistoryElement; - if (UpdateCreateElement != null) yield return UpdateCreateElement; - if (ConditionalCreateElement != null) yield return ConditionalCreateElement; - if (ConditionalReadElement != null) yield return ConditionalReadElement; - if (ConditionalUpdateElement != null) yield return ConditionalUpdateElement; - if (ConditionalDeleteElement != null) yield return ConditionalDeleteElement; - foreach (var elem in ReferencePolicyElement) { if (elem != null) yield return elem; } - foreach (var elem in SearchIncludeElement) { if (elem != null) yield return elem; } - foreach (var elem in SearchRevIncludeElement) { if (elem != null) yield return elem; } - foreach (var elem in SearchParam) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - foreach (var elem in Interaction) { if (elem != null) yield return new ElementValue("interaction", elem); } - if (VersioningElement != null) yield return new ElementValue("versioning", VersioningElement); - if (ReadHistoryElement != null) yield return new ElementValue("readHistory", ReadHistoryElement); - if (UpdateCreateElement != null) yield return new ElementValue("updateCreate", UpdateCreateElement); - if (ConditionalCreateElement != null) yield return new ElementValue("conditionalCreate", ConditionalCreateElement); - if (ConditionalReadElement != null) yield return new ElementValue("conditionalRead", ConditionalReadElement); - if (ConditionalUpdateElement != null) yield return new ElementValue("conditionalUpdate", ConditionalUpdateElement); - if (ConditionalDeleteElement != null) yield return new ElementValue("conditionalDelete", ConditionalDeleteElement); - foreach (var elem in ReferencePolicyElement) { if (elem != null) yield return new ElementValue("referencePolicy", elem); } - foreach (var elem in SearchIncludeElement) { if (elem != null) yield return new ElementValue("searchInclude", elem); } - foreach (var elem in SearchRevIncludeElement) { if (elem != null) yield return new ElementValue("searchRevInclude", elem); } - foreach (var elem in SearchParam) { if (elem != null) yield return new ElementValue("searchParam", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2253,7 +2077,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2308,7 +2132,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2456,29 +2280,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2494,7 +2296,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2510,7 +2312,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -2714,33 +2516,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DefinitionElement != null) yield return DefinitionElement; - if (TypeElement != null) yield return TypeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2762,7 +2538,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2784,7 +2560,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2921,29 +2697,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2959,7 +2713,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2975,7 +2729,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -3093,29 +2847,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Definition != null) yield return Definition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Definition != null) yield return new ElementValue("definition", Definition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3131,7 +2863,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3147,7 +2879,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -3331,35 +3063,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (ReliableCacheElement != null) yield return ReliableCacheElement; - if (DocumentationElement != null) yield return DocumentationElement; - foreach (var elem in SupportedMessage) { if (elem != null) yield return elem; } - foreach (var elem in Event) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (ReliableCacheElement != null) yield return new ElementValue("reliableCache", ReliableCacheElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - foreach (var elem in SupportedMessage) { if (elem != null) yield return new ElementValue("supportedMessage", elem); } - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3384,7 +3088,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3409,7 +3113,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Endpoint?.Any() == true) yield return new KeyValuePair("endpoint",Endpoint); @@ -3529,29 +3233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Protocol != null) yield return Protocol; - if (AddressElement != null) yield return AddressElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Protocol != null) yield return new ElementValue("protocol", Protocol); - if (AddressElement != null) yield return new ElementValue("address", AddressElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3567,7 +3249,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3583,7 +3265,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Protocol is not null) yield return new KeyValuePair("protocol",Protocol); @@ -3704,29 +3386,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (Definition != null) yield return Definition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (Definition != null) yield return new ElementValue("definition", Definition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3742,7 +3402,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3758,7 +3418,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -4023,39 +3683,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (CategoryElement != null) yield return CategoryElement; - if (ModeElement != null) yield return ModeElement; - if (FocusElement != null) yield return FocusElement; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (FocusElement != null) yield return new ElementValue("focus", FocusElement); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4086,7 +3714,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4117,7 +3745,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -4276,31 +3904,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (Profile != null) yield return Profile; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4319,7 +3923,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4338,7 +3942,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -5170,79 +4774,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (KindElement != null) yield return KindElement; - foreach (var elem in InstantiatesElement) { if (elem != null) yield return elem; } - if (Software != null) yield return Software; - if (Implementation != null) yield return Implementation; - if (FhirVersionElement != null) yield return FhirVersionElement; - if (AcceptUnknownElement != null) yield return AcceptUnknownElement; - foreach (var elem in FormatElement) { if (elem != null) yield return elem; } - foreach (var elem in PatchFormatElement) { if (elem != null) yield return elem; } - foreach (var elem in ImplementationGuideElement) { if (elem != null) yield return elem; } - foreach (var elem in Profile) { if (elem != null) yield return elem; } - foreach (var elem in Rest) { if (elem != null) yield return elem; } - foreach (var elem in Messaging) { if (elem != null) yield return elem; } - foreach (var elem in Document) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - foreach (var elem in InstantiatesElement) { if (elem != null) yield return new ElementValue("instantiates", elem); } - if (Software != null) yield return new ElementValue("software", Software); - if (Implementation != null) yield return new ElementValue("implementation", Implementation); - if (FhirVersionElement != null) yield return new ElementValue("fhirVersion", FhirVersionElement); - if (AcceptUnknownElement != null) yield return new ElementValue("acceptUnknown", AcceptUnknownElement); - foreach (var elem in FormatElement) { if (elem != null) yield return new ElementValue("format", elem); } - foreach (var elem in PatchFormatElement) { if (elem != null) yield return new ElementValue("patchFormat", elem); } - foreach (var elem in ImplementationGuideElement) { if (elem != null) yield return new ElementValue("implementationGuide", elem); } - foreach (var elem in Profile) { if (elem != null) yield return new ElementValue("profile", elem); } - foreach (var elem in Rest) { if (elem != null) yield return new ElementValue("rest", elem); } - foreach (var elem in Messaging) { if (elem != null) yield return new ElementValue("messaging", elem); } - foreach (var elem in Document) { if (elem != null) yield return new ElementValue("document", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5333,7 +4865,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5424,7 +4956,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs b/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs index 31ebd76427..8528d29b7a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CarePlan.cs @@ -340,35 +340,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in OutcomeCodeableConcept) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeReference) { if (elem != null) yield return elem; } - foreach (var elem in Progress) { if (elem != null) yield return elem; } - if (Reference != null) yield return Reference; - if (Detail != null) yield return Detail; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in OutcomeCodeableConcept) { if (elem != null) yield return new ElementValue("outcomeCodeableConcept", elem); } - foreach (var elem in OutcomeReference) { if (elem != null) yield return new ElementValue("outcomeReference", elem); } - foreach (var elem in Progress) { if (elem != null) yield return new ElementValue("progress", elem); } - if (Reference != null) yield return new ElementValue("reference", Reference); - if (Detail != null) yield return new ElementValue("detail", Detail); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -393,7 +365,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -418,7 +390,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (OutcomeCodeableConcept?.Any() == true) yield return new KeyValuePair("outcomeCodeableConcept",OutcomeCodeableConcept); @@ -839,57 +811,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Definition != null) yield return Definition; - if (Code != null) yield return Code; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReasonElement != null) yield return StatusReasonElement; - if (ProhibitedElement != null) yield return ProhibitedElement; - if (Scheduled != null) yield return Scheduled; - if (Location != null) yield return Location; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Product != null) yield return Product; - if (DailyAmount != null) yield return DailyAmount; - if (Quantity != null) yield return Quantity; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Definition != null) yield return new ElementValue("definition", Definition); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReasonElement != null) yield return new ElementValue("statusReason", StatusReasonElement); - if (ProhibitedElement != null) yield return new ElementValue("prohibited", ProhibitedElement); - if (Scheduled != null) yield return new ElementValue("scheduled", Scheduled); - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Product != null) yield return new ElementValue("product", Product); - if (DailyAmount != null) yield return new ElementValue("dailyAmount", DailyAmount); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -947,7 +869,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1005,7 +927,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -1504,65 +1426,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Period != null) yield return Period; - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Activity) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Activity) { if (elem != null) yield return new ElementValue("activity", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1632,7 +1496,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1702,7 +1566,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs b/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs index 89c50968da..5539617f3e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CareTeam.cs @@ -223,33 +223,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Member != null) yield return Member; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Member != null) yield return new ElementValue("member", Member); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -271,7 +245,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -293,7 +267,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -592,49 +566,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Period != null) yield return Period; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in ManagingOrganization) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in ManagingOrganization) { if (elem != null) yield return new ElementValue("managingOrganization", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -680,7 +612,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -726,7 +658,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs b/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs index 3f7ac8818e..ca7d4f014e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ChargeItem.cs @@ -202,29 +202,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -240,7 +218,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -256,7 +234,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -801,71 +779,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - foreach (var elem in DefinitionElement) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Occurrence != null) yield return Occurrence; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (PerformingOrganization != null) yield return PerformingOrganization; - if (RequestingOrganization != null) yield return RequestingOrganization; - if (Quantity != null) yield return Quantity; - foreach (var elem in Bodysite) { if (elem != null) yield return elem; } - if (FactorOverrideElement != null) yield return FactorOverrideElement; - if (PriceOverride != null) yield return PriceOverride; - if (OverrideReasonElement != null) yield return OverrideReasonElement; - if (Enterer != null) yield return Enterer; - if (EnteredDateElement != null) yield return EnteredDateElement; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Service) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - foreach (var elem in DefinitionElement) { if (elem != null) yield return new ElementValue("definition", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (PerformingOrganization != null) yield return new ElementValue("performingOrganization", PerformingOrganization); - if (RequestingOrganization != null) yield return new ElementValue("requestingOrganization", RequestingOrganization); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - foreach (var elem in Bodysite) { if (elem != null) yield return new ElementValue("bodysite", elem); } - if (FactorOverrideElement != null) yield return new ElementValue("factorOverride", FactorOverrideElement); - if (PriceOverride != null) yield return new ElementValue("priceOverride", PriceOverride); - if (OverrideReasonElement != null) yield return new ElementValue("overrideReason", OverrideReasonElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (EnteredDateElement != null) yield return new ElementValue("enteredDate", EnteredDateElement); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Service) { if (elem != null) yield return new ElementValue("service", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -944,7 +858,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1023,7 +937,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs b/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs index ed9e8c96a8..e04d6be5cc 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Claim.cs @@ -199,31 +199,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Claim != null) yield return Claim; - if (Relationship != null) yield return Relationship; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Claim != null) yield return new ElementValue("claim", Claim); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -242,7 +218,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -261,7 +237,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Claim is not null) yield return new KeyValuePair("claim",Claim); @@ -379,31 +355,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ResourceType != null) yield return ResourceType; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ResourceType != null) yield return new ElementValue("resourceType", ResourceType); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -422,7 +374,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -441,7 +393,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -628,35 +580,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Provider != null) yield return Provider; - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Role != null) yield return Role; - if (Qualification != null) yield return Qualification; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Role != null) yield return new ElementValue("role", Role); - if (Qualification != null) yield return new ElementValue("qualification", Qualification); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -681,7 +605,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -706,7 +630,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -897,37 +821,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Timing != null) yield return Timing; - if (Value != null) yield return Value; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Value != null) yield return new ElementValue("value", Value); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -955,7 +849,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -983,7 +877,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1142,33 +1036,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Diagnosis != null) yield return Diagnosis; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (PackageCode != null) yield return PackageCode; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (PackageCode != null) yield return new ElementValue("packageCode", PackageCode); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1190,7 +1058,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1212,7 +1080,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1368,31 +1236,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (DateElement != null) yield return DateElement; - if (Procedure != null) yield return Procedure; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1411,7 +1255,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1430,7 +1274,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1671,37 +1515,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - if (ClaimResponse != null) yield return ClaimResponse; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1729,7 +1543,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1757,7 +1571,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1900,31 +1714,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Type != null) yield return Type; - if (Location != null) yield return Location; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Location != null) yield return new ElementValue("location", Location); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1943,7 +1733,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1962,7 +1752,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -2499,67 +2289,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in CareTeamLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in DiagnosisLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in ProcedureLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in InformationLinkIdElement) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in CareTeamLinkIdElement) { if (elem != null) yield return new ElementValue("careTeamLinkId", elem); } - foreach (var elem in DiagnosisLinkIdElement) { if (elem != null) yield return new ElementValue("diagnosisLinkId", elem); } - foreach (var elem in ProcedureLinkIdElement) { if (elem != null) yield return new ElementValue("procedureLinkId", elem); } - foreach (var elem in InformationLinkIdElement) { if (elem != null) yield return new ElementValue("informationLinkId", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2632,7 +2362,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2705,7 +2435,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3028,49 +2758,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3116,7 +2804,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3162,7 +2850,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3459,47 +3147,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3542,7 +3190,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3585,7 +3233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4213,85 +3861,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - foreach (var elem in SubType) { if (elem != null) yield return elem; } - if (UseElement != null) yield return UseElement; - if (Patient != null) yield return Patient; - if (BillablePeriod != null) yield return BillablePeriod; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Organization != null) yield return Organization; - if (Priority != null) yield return Priority; - if (FundsReserve != null) yield return FundsReserve; - foreach (var elem in Related) { if (elem != null) yield return elem; } - if (Prescription != null) yield return Prescription; - if (OriginalPrescription != null) yield return OriginalPrescription; - if (Payee != null) yield return Payee; - if (Referral != null) yield return Referral; - if (Facility != null) yield return Facility; - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in Information) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (Accident != null) yield return Accident; - if (EmploymentImpacted != null) yield return EmploymentImpacted; - if (Hospitalization != null) yield return Hospitalization; - foreach (var elem in Item) { if (elem != null) yield return elem; } - if (Total != null) yield return Total; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in SubType) { if (elem != null) yield return new ElementValue("subType", elem); } - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (BillablePeriod != null) yield return new ElementValue("billablePeriod", BillablePeriod); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (FundsReserve != null) yield return new ElementValue("fundsReserve", FundsReserve); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - if (Prescription != null) yield return new ElementValue("prescription", Prescription); - if (OriginalPrescription != null) yield return new ElementValue("originalPrescription", OriginalPrescription); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (Referral != null) yield return new ElementValue("referral", Referral); - if (Facility != null) yield return new ElementValue("facility", Facility); - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in Information) { if (elem != null) yield return new ElementValue("information", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (Accident != null) yield return new ElementValue("accident", Accident); - if (EmploymentImpacted != null) yield return new ElementValue("employmentImpacted", EmploymentImpacted); - if (Hospitalization != null) yield return new ElementValue("hospitalization", Hospitalization); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - if (Total != null) yield return new ElementValue("total", Total); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4391,7 +3961,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4491,7 +4061,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs index d27c7a9047..98e344e2f5 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ClaimResponse.cs @@ -218,33 +218,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceLinkIdElement != null) yield return SequenceLinkIdElement; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceLinkIdElement != null) yield return new ElementValue("sequenceLinkId", SequenceLinkIdElement); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -266,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -288,7 +262,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceLinkIdElement is not null) yield return new KeyValuePair("sequenceLinkId",SequenceLinkIdElement); @@ -439,33 +413,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Reason != null) yield return Reason; - if (Amount != null) yield return Amount; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -487,7 +435,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -509,7 +457,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -679,33 +627,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceLinkIdElement != null) yield return SequenceLinkIdElement; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceLinkIdElement != null) yield return new ElementValue("sequenceLinkId", SequenceLinkIdElement); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -727,7 +649,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -749,7 +671,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceLinkIdElement is not null) yield return new KeyValuePair("sequenceLinkId",SequenceLinkIdElement); @@ -902,31 +824,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceLinkIdElement != null) yield return SequenceLinkIdElement; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceLinkIdElement != null) yield return new ElementValue("sequenceLinkId", SequenceLinkIdElement); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -945,7 +843,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -964,7 +862,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceLinkIdElement is not null) yield return new KeyValuePair("sequenceLinkId",SequenceLinkIdElement); @@ -1218,43 +1116,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in SequenceLinkIdElement) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Fee != null) yield return Fee; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in SequenceLinkIdElement) { if (elem != null) yield return new ElementValue("sequenceLinkId", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Fee != null) yield return new ElementValue("fee", Fee); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1291,7 +1153,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1328,7 +1190,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceLinkIdElement?.Any() == true) yield return new KeyValuePair("sequenceLinkId",SequenceLinkIdElement); @@ -1536,39 +1398,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Fee != null) yield return Fee; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Fee != null) yield return new ElementValue("fee", Fee); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1599,7 +1429,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1630,7 +1460,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Revenue is not null) yield return new KeyValuePair("revenue",Revenue); @@ -1819,33 +1649,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceLinkIdElement != null) yield return SequenceLinkIdElement; - if (DetailSequenceLinkIdElement != null) yield return DetailSequenceLinkIdElement; - if (SubdetailSequenceLinkIdElement != null) yield return SubdetailSequenceLinkIdElement; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceLinkIdElement != null) yield return new ElementValue("sequenceLinkId", SequenceLinkIdElement); - if (DetailSequenceLinkIdElement != null) yield return new ElementValue("detailSequenceLinkId", DetailSequenceLinkIdElement); - if (SubdetailSequenceLinkIdElement != null) yield return new ElementValue("subdetailSequenceLinkId", SubdetailSequenceLinkIdElement); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1867,7 +1671,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1889,7 +1693,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceLinkIdElement is not null) yield return new KeyValuePair("sequenceLinkId",SequenceLinkIdElement); @@ -2071,37 +1875,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Adjustment != null) yield return Adjustment; - if (AdjustmentReason != null) yield return AdjustmentReason; - if (DateElement != null) yield return DateElement; - if (Amount != null) yield return Amount; - if (Identifier != null) yield return Identifier; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Adjustment != null) yield return new ElementValue("adjustment", Adjustment); - if (AdjustmentReason != null) yield return new ElementValue("adjustmentReason", AdjustmentReason); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2129,7 +1903,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2157,7 +1931,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -2327,33 +2101,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (Type != null) yield return Type; - if (TextElement != null) yield return TextElement; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (Type != null) yield return new ElementValue("type", Type); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2375,7 +2123,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2397,7 +2145,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -2639,37 +2387,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (FocalElement != null) yield return FocalElement; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - if (ClaimResponse != null) yield return ClaimResponse; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (FocalElement != null) yield return new ElementValue("focal", FocalElement); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2697,7 +2415,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2725,7 +2443,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3226,71 +2944,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (CreatedElement != null) yield return CreatedElement; - if (Insurer != null) yield return Insurer; - if (RequestProvider != null) yield return RequestProvider; - if (RequestOrganization != null) yield return RequestOrganization; - if (Request != null) yield return Request; - if (Outcome != null) yield return Outcome; - if (DispositionElement != null) yield return DispositionElement; - if (PayeeType != null) yield return PayeeType; - foreach (var elem in Item) { if (elem != null) yield return elem; } - foreach (var elem in AddItem) { if (elem != null) yield return elem; } - foreach (var elem in Error) { if (elem != null) yield return elem; } - if (TotalCost != null) yield return TotalCost; - if (UnallocDeductable != null) yield return UnallocDeductable; - if (TotalBenefit != null) yield return TotalBenefit; - if (Payment != null) yield return Payment; - if (Reserved != null) yield return Reserved; - if (Form != null) yield return Form; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return elem; } - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (RequestProvider != null) yield return new ElementValue("requestProvider", RequestProvider); - if (RequestOrganization != null) yield return new ElementValue("requestOrganization", RequestOrganization); - if (Request != null) yield return new ElementValue("request", Request); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (PayeeType != null) yield return new ElementValue("payeeType", PayeeType); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - foreach (var elem in AddItem) { if (elem != null) yield return new ElementValue("addItem", elem); } - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - if (TotalCost != null) yield return new ElementValue("totalCost", TotalCost); - if (UnallocDeductable != null) yield return new ElementValue("unallocDeductable", UnallocDeductable); - if (TotalBenefit != null) yield return new ElementValue("totalBenefit", TotalBenefit); - if (Payment != null) yield return new ElementValue("payment", Payment); - if (Reserved != null) yield return new ElementValue("reserved", Reserved); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return new ElementValue("communicationRequest", elem); } - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3369,7 +3023,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3448,7 +3102,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs b/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs index d01a2e0c23..24ba54b353 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ClinicalImpression.cs @@ -179,29 +179,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -217,7 +195,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -233,7 +211,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -352,29 +330,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (BasisElement != null) yield return BasisElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (BasisElement != null) yield return new ElementValue("basis", BasisElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -390,7 +346,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -406,7 +362,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -881,63 +837,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Effective != null) yield return Effective; - if (DateElement != null) yield return DateElement; - if (Assessor != null) yield return Assessor; - if (Previous != null) yield return Previous; - foreach (var elem in Problem) { if (elem != null) yield return elem; } - foreach (var elem in Investigation) { if (elem != null) yield return elem; } - foreach (var elem in ProtocolElement) { if (elem != null) yield return elem; } - if (SummaryElement != null) yield return SummaryElement; - foreach (var elem in Finding) { if (elem != null) yield return elem; } - foreach (var elem in PrognosisCodeableConcept) { if (elem != null) yield return elem; } - foreach (var elem in PrognosisReference) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Assessor != null) yield return new ElementValue("assessor", Assessor); - if (Previous != null) yield return new ElementValue("previous", Previous); - foreach (var elem in Problem) { if (elem != null) yield return new ElementValue("problem", elem); } - foreach (var elem in Investigation) { if (elem != null) yield return new ElementValue("investigation", elem); } - foreach (var elem in ProtocolElement) { if (elem != null) yield return new ElementValue("protocol", elem); } - if (SummaryElement != null) yield return new ElementValue("summary", SummaryElement); - foreach (var elem in Finding) { if (elem != null) yield return new ElementValue("finding", elem); } - foreach (var elem in PrognosisCodeableConcept) { if (elem != null) yield return new ElementValue("prognosisCodeableConcept", elem); } - foreach (var elem in PrognosisReference) { if (elem != null) yield return new ElementValue("prognosisReference", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1004,7 +904,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1071,7 +971,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs b/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs index dd18243709..7865b2900f 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CodeSystem.cs @@ -369,33 +369,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in OperatorElement) { if (elem != null) yield return elem; } - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in OperatorElement) { if (elem != null) yield return new ElementValue("operator", elem); } - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -417,7 +391,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -439,7 +413,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -645,33 +619,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (UriElement != null) yield return UriElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -693,7 +641,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -715,7 +663,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -936,37 +884,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (DefinitionElement != null) yield return DefinitionElement; - foreach (var elem in Designation) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in Concept) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - foreach (var elem in Designation) { if (elem != null) yield return new ElementValue("designation", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in Concept) { if (elem != null) yield return new ElementValue("concept", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -994,7 +912,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1022,7 +940,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1177,31 +1095,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LanguageElement != null) yield return LanguageElement; - if (Use != null) yield return Use; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (Use != null) yield return new ElementValue("use", Use); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1220,7 +1114,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1239,7 +1133,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LanguageElement is not null) yield return new KeyValuePair("language",LanguageElement); @@ -1358,29 +1252,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1396,7 +1268,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1412,7 +1284,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -2201,75 +2073,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (CaseSensitiveElement != null) yield return CaseSensitiveElement; - if (ValueSetElement != null) yield return ValueSetElement; - if (HierarchyMeaningElement != null) yield return HierarchyMeaningElement; - if (CompositionalElement != null) yield return CompositionalElement; - if (VersionNeededElement != null) yield return VersionNeededElement; - if (ContentElement != null) yield return ContentElement; - if (CountElement != null) yield return CountElement; - foreach (var elem in Filter) { if (elem != null) yield return elem; } - foreach (var elem in Property) { if (elem != null) yield return elem; } - foreach (var elem in Concept) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (CaseSensitiveElement != null) yield return new ElementValue("caseSensitive", CaseSensitiveElement); - if (ValueSetElement != null) yield return new ElementValue("valueSet", ValueSetElement); - if (HierarchyMeaningElement != null) yield return new ElementValue("hierarchyMeaning", HierarchyMeaningElement); - if (CompositionalElement != null) yield return new ElementValue("compositional", CompositionalElement); - if (VersionNeededElement != null) yield return new ElementValue("versionNeeded", VersionNeededElement); - if (ContentElement != null) yield return new ElementValue("content", ContentElement); - if (CountElement != null) yield return new ElementValue("count", CountElement); - foreach (var elem in Filter) { if (elem != null) yield return new ElementValue("filter", elem); } - foreach (var elem in Property) { if (elem != null) yield return new ElementValue("property", elem); } - foreach (var elem in Concept) { if (elem != null) yield return new ElementValue("concept", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2354,7 +2158,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2439,7 +2243,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs b/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs index 7adb3980be..0f781c80cd 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Communication.cs @@ -134,27 +134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -167,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -180,7 +160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -658,65 +638,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (NotDoneElement != null) yield return NotDoneElement; - if (NotDoneReason != null) yield return NotDoneReason; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Medium) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - foreach (var elem in Topic) { if (elem != null) yield return elem; } - if (Context != null) yield return Context; - if (SentElement != null) yield return SentElement; - if (ReceivedElement != null) yield return ReceivedElement; - if (Sender != null) yield return Sender; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Payload) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (NotDoneElement != null) yield return new ElementValue("notDone", NotDoneElement); - if (NotDoneReason != null) yield return new ElementValue("notDoneReason", NotDoneReason); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Medium) { if (elem != null) yield return new ElementValue("medium", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - if (Context != null) yield return new ElementValue("context", Context); - if (SentElement != null) yield return new ElementValue("sent", SentElement); - if (ReceivedElement != null) yield return new ElementValue("received", ReceivedElement); - if (Sender != null) yield return new ElementValue("sender", Sender); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Payload) { if (elem != null) yield return new ElementValue("payload", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -786,7 +708,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -856,7 +778,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs index 840b5ec975..39c4d6d7ea 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CommunicationRequest.cs @@ -134,27 +134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -167,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -180,7 +160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -280,29 +260,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Agent != null) yield return Agent; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Agent != null) yield return new ElementValue("agent", Agent); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -318,7 +276,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -334,7 +292,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Agent is not null) yield return new KeyValuePair("agent",Agent); @@ -795,65 +753,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in Medium) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - foreach (var elem in Topic) { if (elem != null) yield return elem; } - if (Context != null) yield return Context; - foreach (var elem in Payload) { if (elem != null) yield return elem; } - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Sender != null) yield return Sender; - if (Requester != null) yield return Requester; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in Medium) { if (elem != null) yield return new ElementValue("medium", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in Payload) { if (elem != null) yield return new ElementValue("payload", elem); } - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Sender != null) yield return new ElementValue("sender", Sender); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -923,7 +823,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -993,7 +893,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs index c591b78a2c..7003011219 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/CompartmentDefinition.cs @@ -221,31 +221,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in ParamElement) { if (elem != null) yield return elem; } - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in ParamElement) { if (elem != null) yield return new ElementValue("param", elem); } - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -264,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +259,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -784,55 +760,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (PurposeElement != null) yield return PurposeElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CodeElement != null) yield return CodeElement; - if (SearchElement != null) yield return SearchElement; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (SearchElement != null) yield return new ElementValue("search", SearchElement); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -887,7 +815,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -942,7 +870,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs b/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs index c99b4deb68..ffa1615483 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Composition.cs @@ -302,31 +302,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ModeElement) { if (elem != null) yield return elem; } - if (TimeElement != null) yield return TimeElement; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ModeElement) { if (elem != null) yield return new ElementValue("mode", elem); } - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -345,7 +321,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -364,7 +340,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement?.Any() == true) yield return new KeyValuePair("mode",ModeElement); @@ -487,29 +463,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -525,7 +479,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -541,7 +495,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -659,31 +613,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -702,7 +632,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -721,7 +651,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -959,41 +889,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TitleElement != null) yield return TitleElement; - if (Code != null) yield return Code; - if (Text != null) yield return Text; - if (ModeElement != null) yield return ModeElement; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in Entry) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Text != null) yield return new ElementValue("text", Text); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1027,7 +923,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1061,7 +957,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TitleElement is not null) yield return new KeyValuePair("title",TitleElement); @@ -1453,55 +1349,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Class != null) yield return Class; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - if (ConfidentialityElement != null) yield return ConfidentialityElement; - foreach (var elem in Attester) { if (elem != null) yield return elem; } - if (Custodian != null) yield return Custodian; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - foreach (var elem in Event) { if (elem != null) yield return elem; } - foreach (var elem in Section) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Class != null) yield return new ElementValue("class", Class); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (ConfidentialityElement != null) yield return new ElementValue("confidentiality", ConfidentialityElement); - foreach (var elem in Attester) { if (elem != null) yield return new ElementValue("attester", elem); } - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - foreach (var elem in Section) { if (elem != null) yield return new ElementValue("section", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1556,7 +1404,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1611,7 +1459,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs b/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs index e5ac9484a6..255a337068 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ConceptMap.cs @@ -381,37 +381,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceElement != null) yield return SourceElement; - if (SourceVersionElement != null) yield return SourceVersionElement; - if (TargetElement != null) yield return TargetElement; - if (TargetVersionElement != null) yield return TargetVersionElement; - foreach (var elem in Element) { if (elem != null) yield return elem; } - if (Unmapped != null) yield return Unmapped; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (SourceVersionElement != null) yield return new ElementValue("sourceVersion", SourceVersionElement); - if (TargetElement != null) yield return new ElementValue("target", TargetElement); - if (TargetVersionElement != null) yield return new ElementValue("targetVersion", TargetVersionElement); - foreach (var elem in Element) { if (elem != null) yield return new ElementValue("element", elem); } - if (Unmapped != null) yield return new ElementValue("unmapped", Unmapped); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +409,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -467,7 +437,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceElement is not null) yield return new KeyValuePair("source",SourceElement); @@ -621,31 +591,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -664,7 +610,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -683,7 +629,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -921,37 +867,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (EquivalenceElement != null) yield return EquivalenceElement; - if (CommentElement != null) yield return CommentElement; - foreach (var elem in DependsOn) { if (elem != null) yield return elem; } - foreach (var elem in Product) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (EquivalenceElement != null) yield return new ElementValue("equivalence", EquivalenceElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - foreach (var elem in DependsOn) { if (elem != null) yield return new ElementValue("dependsOn", elem); } - foreach (var elem in Product) { if (elem != null) yield return new ElementValue("product", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -979,7 +895,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1007,7 +923,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1213,33 +1129,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PropertyElement != null) yield return PropertyElement; - if (SystemElement != null) yield return SystemElement; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PropertyElement != null) yield return new ElementValue("property", PropertyElement); - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1261,7 +1151,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1283,7 +1173,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PropertyElement is not null) yield return new KeyValuePair("property",PropertyElement); @@ -1489,33 +1379,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ModeElement != null) yield return ModeElement; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1537,7 +1401,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1559,7 +1423,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ModeElement is not null) yield return new KeyValuePair("mode",ModeElement); @@ -2111,61 +1975,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (Source != null) yield return Source; - if (Target != null) yield return Target; - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (Source != null) yield return new ElementValue("source", Source); - if (Target != null) yield return new ElementValue("target", Target); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2229,7 +2039,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2293,7 +2103,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs b/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs index 28b4997bd3..8198e7fc32 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Condition.cs @@ -236,29 +236,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Summary != null) yield return Summary; - foreach (var elem in Assessment) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Summary != null) yield return new ElementValue("summary", Summary); - foreach (var elem in Assessment) { if (elem != null) yield return new ElementValue("assessment", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -274,7 +252,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -290,7 +268,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Summary is not null) yield return new KeyValuePair("summary",Summary); @@ -392,29 +370,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -430,7 +386,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -446,7 +402,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code?.Any() == true) yield return new KeyValuePair("code",Code); @@ -830,57 +786,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ClinicalStatusElement != null) yield return ClinicalStatusElement; - if (VerificationStatusElement != null) yield return VerificationStatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Severity != null) yield return Severity; - if (Code != null) yield return Code; - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Onset != null) yield return Onset; - if (Abatement != null) yield return Abatement; - if (AssertedDateElement != null) yield return AssertedDateElement; - if (Asserter != null) yield return Asserter; - if (Stage != null) yield return Stage; - foreach (var elem in Evidence) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ClinicalStatusElement != null) yield return new ElementValue("clinicalStatus", ClinicalStatusElement); - if (VerificationStatusElement != null) yield return new ElementValue("verificationStatus", VerificationStatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Severity != null) yield return new ElementValue("severity", Severity); - if (Code != null) yield return new ElementValue("code", Code); - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Onset != null) yield return new ElementValue("onset", Onset); - if (Abatement != null) yield return new ElementValue("abatement", Abatement); - if (AssertedDateElement != null) yield return new ElementValue("assertedDate", AssertedDateElement); - if (Asserter != null) yield return new ElementValue("asserter", Asserter); - if (Stage != null) yield return new ElementValue("stage", Stage); - foreach (var elem in Evidence) { if (elem != null) yield return new ElementValue("evidence", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -938,7 +844,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -996,7 +902,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs b/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs index 027f4a0114..95015f1c0e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Consent.cs @@ -254,29 +254,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -292,7 +270,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -308,7 +286,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -440,29 +418,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AuthorityElement != null) yield return AuthorityElement; - if (UriElement != null) yield return UriElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AuthorityElement != null) yield return new ElementValue("authority", AuthorityElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -478,7 +434,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -494,7 +450,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AuthorityElement is not null) yield return new KeyValuePair("authority",AuthorityElement); @@ -614,29 +570,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MeaningElement != null) yield return MeaningElement; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MeaningElement != null) yield return new ElementValue("meaning", MeaningElement); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -652,7 +586,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -668,7 +602,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MeaningElement is not null) yield return new KeyValuePair("meaning",MeaningElement); @@ -925,45 +859,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Period != null) yield return Period; - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Purpose) { if (elem != null) yield return elem; } - foreach (var elem in Class) { if (elem != null) yield return elem; } - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (DataPeriod != null) yield return DataPeriod; - foreach (var elem in Data) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Purpose) { if (elem != null) yield return new ElementValue("purpose", elem); } - foreach (var elem in Class) { if (elem != null) yield return new ElementValue("class", elem); } - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (DataPeriod != null) yield return new ElementValue("dataPeriod", DataPeriod); - foreach (var elem in Data) { if (elem != null) yield return new ElementValue("data", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1003,7 +899,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1043,7 +939,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1152,29 +1048,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1190,7 +1064,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1206,7 +1080,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -1326,29 +1200,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MeaningElement != null) yield return MeaningElement; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MeaningElement != null) yield return new ElementValue("meaning", MeaningElement); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1364,7 +1216,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1380,7 +1232,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MeaningElement is not null) yield return new KeyValuePair("meaning",MeaningElement); @@ -1799,61 +1651,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Period != null) yield return Period; - if (DateTimeElement != null) yield return DateTimeElement; - foreach (var elem in ConsentingParty) { if (elem != null) yield return elem; } - foreach (var elem in Actor) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in Organization) { if (elem != null) yield return elem; } - if (Source != null) yield return Source; - foreach (var elem in Policy) { if (elem != null) yield return elem; } - if (PolicyRuleElement != null) yield return PolicyRuleElement; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Purpose) { if (elem != null) yield return elem; } - if (DataPeriod != null) yield return DataPeriod; - foreach (var elem in Data) { if (elem != null) yield return elem; } - foreach (var elem in Except) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Period != null) yield return new ElementValue("period", Period); - if (DateTimeElement != null) yield return new ElementValue("dateTime", DateTimeElement); - foreach (var elem in ConsentingParty) { if (elem != null) yield return new ElementValue("consentingParty", elem); } - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in Organization) { if (elem != null) yield return new ElementValue("organization", elem); } - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Policy) { if (elem != null) yield return new ElementValue("policy", elem); } - if (PolicyRuleElement != null) yield return new ElementValue("policyRule", PolicyRuleElement); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Purpose) { if (elem != null) yield return new ElementValue("purpose", elem); } - if (DataPeriod != null) yield return new ElementValue("dataPeriod", DataPeriod); - foreach (var elem in Data) { if (elem != null) yield return new ElementValue("data", elem); } - foreach (var elem in Except) { if (elem != null) yield return new ElementValue("except", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1917,7 +1715,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1981,7 +1779,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs b/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs index a5f6773141..e1f90fdabc 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Contract.cs @@ -253,29 +253,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Actor != null) yield return Actor; - foreach (var elem in Role) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Actor != null) yield return new ElementValue("actor", Actor); - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -291,7 +269,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -307,7 +285,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Actor is not null) yield return new KeyValuePair("actor",Actor); @@ -427,31 +405,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Party != null) yield return Party; - foreach (var elem in Signature) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Party != null) yield return new ElementValue("party", Party); - foreach (var elem in Signature) { if (elem != null) yield return new ElementValue("signature", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -470,7 +424,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -489,7 +443,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -736,41 +690,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Entity != null) yield return Entity; - if (Identifier != null) yield return Identifier; - if (EffectiveTimeElement != null) yield return EffectiveTimeElement; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (PointsElement != null) yield return PointsElement; - if (Net != null) yield return Net; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Entity != null) yield return new ElementValue("entity", Entity); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (EffectiveTimeElement != null) yield return new ElementValue("effectiveTime", EffectiveTimeElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (PointsElement != null) yield return new ElementValue("points", PointsElement); - if (Net != null) yield return new ElementValue("net", Net); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -804,7 +724,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -838,7 +758,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Entity is not null) yield return new KeyValuePair("entity",Entity); @@ -1166,51 +1086,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (IssuedElement != null) yield return IssuedElement; - if (Applies != null) yield return Applies; - if (Type != null) yield return Type; - if (SubType != null) yield return SubType; - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in ActionReason) { if (elem != null) yield return elem; } - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Agent) { if (elem != null) yield return elem; } - if (TextElement != null) yield return TextElement; - foreach (var elem in ValuedItem) { if (elem != null) yield return elem; } - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Applies != null) yield return new ElementValue("applies", Applies); - if (Type != null) yield return new ElementValue("type", Type); - if (SubType != null) yield return new ElementValue("subType", SubType); - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in ActionReason) { if (elem != null) yield return new ElementValue("actionReason", elem); } - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in ValuedItem) { if (elem != null) yield return new ElementValue("valuedItem", elem); } - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1259,7 +1135,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1308,7 +1184,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1422,29 +1298,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Actor != null) yield return Actor; - foreach (var elem in Role) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Actor != null) yield return new ElementValue("actor", Actor); - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1460,7 +1314,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1476,7 +1330,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Actor is not null) yield return new KeyValuePair("actor",Actor); @@ -1725,41 +1579,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Entity != null) yield return Entity; - if (Identifier != null) yield return Identifier; - if (EffectiveTimeElement != null) yield return EffectiveTimeElement; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (PointsElement != null) yield return PointsElement; - if (Net != null) yield return Net; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Entity != null) yield return new ElementValue("entity", Entity); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (EffectiveTimeElement != null) yield return new ElementValue("effectiveTime", EffectiveTimeElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (PointsElement != null) yield return new ElementValue("points", PointsElement); - if (Net != null) yield return new ElementValue("net", Net); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1793,7 +1613,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1827,7 +1647,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Entity is not null) yield return new KeyValuePair("entity",Entity); @@ -1917,27 +1737,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1950,7 +1750,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1963,7 +1763,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -2046,27 +1846,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2079,7 +1859,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2092,7 +1872,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -2175,27 +1955,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Content != null) yield return Content; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Content != null) yield return new ElementValue("content", Content); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2208,7 +1968,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2221,7 +1981,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Content is not null) yield return new KeyValuePair("content",Content); @@ -2709,71 +2469,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - if (IssuedElement != null) yield return IssuedElement; - if (Applies != null) yield return Applies; - foreach (var elem in Subject) { if (elem != null) yield return elem; } - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Authority) { if (elem != null) yield return elem; } - foreach (var elem in Domain) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - foreach (var elem in SubType) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - foreach (var elem in ActionReason) { if (elem != null) yield return elem; } - if (DecisionType != null) yield return DecisionType; - if (ContentDerivative != null) yield return ContentDerivative; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Agent) { if (elem != null) yield return elem; } - foreach (var elem in Signer) { if (elem != null) yield return elem; } - foreach (var elem in ValuedItem) { if (elem != null) yield return elem; } - foreach (var elem in Term) { if (elem != null) yield return elem; } - if (Binding != null) yield return Binding; - foreach (var elem in Friendly) { if (elem != null) yield return elem; } - foreach (var elem in Legal) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - if (Applies != null) yield return new ElementValue("applies", Applies); - foreach (var elem in Subject) { if (elem != null) yield return new ElementValue("subject", elem); } - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Authority) { if (elem != null) yield return new ElementValue("authority", elem); } - foreach (var elem in Domain) { if (elem != null) yield return new ElementValue("domain", elem); } - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in SubType) { if (elem != null) yield return new ElementValue("subType", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - foreach (var elem in ActionReason) { if (elem != null) yield return new ElementValue("actionReason", elem); } - if (DecisionType != null) yield return new ElementValue("decisionType", DecisionType); - if (ContentDerivative != null) yield return new ElementValue("contentDerivative", ContentDerivative); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - foreach (var elem in Signer) { if (elem != null) yield return new ElementValue("signer", elem); } - foreach (var elem in ValuedItem) { if (elem != null) yield return new ElementValue("valuedItem", elem); } - foreach (var elem in Term) { if (elem != null) yield return new ElementValue("term", elem); } - if (Binding != null) yield return new ElementValue("binding", Binding); - foreach (var elem in Friendly) { if (elem != null) yield return new ElementValue("friendly", elem); } - foreach (var elem in Legal) { if (elem != null) yield return new ElementValue("legal", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2852,7 +2548,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2931,7 +2627,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Contributor.cs b/src/Hl7.Fhir.STU3/Model/Generated/Contributor.cs index d7f7fc6094..b474618038 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Contributor.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Contributor.cs @@ -221,31 +221,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (NameElement != null) yield return NameElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -264,7 +240,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -283,7 +259,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs b/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs index 5fb168cc7c..79ba0f8376 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Coverage.cs @@ -522,49 +522,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (GroupElement != null) yield return GroupElement; - if (GroupDisplayElement != null) yield return GroupDisplayElement; - if (SubGroupElement != null) yield return SubGroupElement; - if (SubGroupDisplayElement != null) yield return SubGroupDisplayElement; - if (PlanElement != null) yield return PlanElement; - if (PlanDisplayElement != null) yield return PlanDisplayElement; - if (SubPlanElement != null) yield return SubPlanElement; - if (SubPlanDisplayElement != null) yield return SubPlanDisplayElement; - if (ClassElement != null) yield return ClassElement; - if (ClassDisplayElement != null) yield return ClassDisplayElement; - if (SubClassElement != null) yield return SubClassElement; - if (SubClassDisplayElement != null) yield return SubClassDisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (GroupElement != null) yield return new ElementValue("group", GroupElement); - if (GroupDisplayElement != null) yield return new ElementValue("groupDisplay", GroupDisplayElement); - if (SubGroupElement != null) yield return new ElementValue("subGroup", SubGroupElement); - if (SubGroupDisplayElement != null) yield return new ElementValue("subGroupDisplay", SubGroupDisplayElement); - if (PlanElement != null) yield return new ElementValue("plan", PlanElement); - if (PlanDisplayElement != null) yield return new ElementValue("planDisplay", PlanDisplayElement); - if (SubPlanElement != null) yield return new ElementValue("subPlan", SubPlanElement); - if (SubPlanDisplayElement != null) yield return new ElementValue("subPlanDisplay", SubPlanDisplayElement); - if (ClassElement != null) yield return new ElementValue("class", ClassElement); - if (ClassDisplayElement != null) yield return new ElementValue("classDisplay", ClassDisplayElement); - if (SubClassElement != null) yield return new ElementValue("subClass", SubClassElement); - if (SubClassDisplayElement != null) yield return new ElementValue("subClassDisplay", SubClassDisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -610,7 +568,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -656,7 +614,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (GroupElement is not null) yield return new KeyValuePair("group",GroupElement); @@ -1097,57 +1055,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (PolicyHolder != null) yield return PolicyHolder; - if (Subscriber != null) yield return Subscriber; - if (SubscriberIdElement != null) yield return SubscriberIdElement; - if (Beneficiary != null) yield return Beneficiary; - if (Relationship != null) yield return Relationship; - if (Period != null) yield return Period; - foreach (var elem in Payor) { if (elem != null) yield return elem; } - if (Grouping != null) yield return Grouping; - if (DependentElement != null) yield return DependentElement; - if (SequenceElement != null) yield return SequenceElement; - if (OrderElement != null) yield return OrderElement; - if (NetworkElement != null) yield return NetworkElement; - foreach (var elem in Contract) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (PolicyHolder != null) yield return new ElementValue("policyHolder", PolicyHolder); - if (Subscriber != null) yield return new ElementValue("subscriber", Subscriber); - if (SubscriberIdElement != null) yield return new ElementValue("subscriberId", SubscriberIdElement); - if (Beneficiary != null) yield return new ElementValue("beneficiary", Beneficiary); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Payor) { if (elem != null) yield return new ElementValue("payor", elem); } - if (Grouping != null) yield return new ElementValue("grouping", Grouping); - if (DependentElement != null) yield return new ElementValue("dependent", DependentElement); - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (OrderElement != null) yield return new ElementValue("order", OrderElement); - if (NetworkElement != null) yield return new ElementValue("network", NetworkElement); - foreach (var elem in Contract) { if (elem != null) yield return new ElementValue("contract", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1205,7 +1113,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1263,7 +1171,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs index fb3ba46c58..7cfe7006bf 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DataElement.cs @@ -298,33 +298,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentityElement != null) yield return IdentityElement; - if (UriElement != null) yield return UriElement; - if (NameElement != null) yield return NameElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentityElement != null) yield return new ElementValue("identity", IdentityElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -346,7 +320,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -368,7 +342,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentityElement is not null) yield return new KeyValuePair("identity",IdentityElement); @@ -868,57 +842,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (StringencyElement != null) yield return StringencyElement; - foreach (var elem in Mapping) { if (elem != null) yield return elem; } - foreach (var elem in Element) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (StringencyElement != null) yield return new ElementValue("stringency", StringencyElement); - foreach (var elem in Mapping) { if (elem != null) yield return new ElementValue("mapping", elem); } - foreach (var elem in Element) { if (elem != null) yield return new ElementValue("element", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -976,7 +900,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1034,7 +958,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs index bc5588b83a..d6963a1ccc 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DataRequirement.cs @@ -237,35 +237,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (ValueSet != null) yield return ValueSet; - foreach (var elem in ValueCodeElement) { if (elem != null) yield return elem; } - foreach (var elem in ValueCoding) { if (elem != null) yield return elem; } - foreach (var elem in ValueCodeableConcept) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (ValueSet != null) yield return new ElementValue("valueSet", ValueSet); - foreach (var elem in ValueCodeElement) { if (elem != null) yield return new ElementValue("valueCode", elem); } - foreach (var elem in ValueCoding) { if (elem != null) yield return new ElementValue("valueCoding", elem); } - foreach (var elem in ValueCodeableConcept) { if (elem != null) yield return new ElementValue("valueCodeableConcept", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -290,7 +262,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -315,7 +287,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -435,29 +407,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -473,7 +423,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -489,7 +439,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -678,35 +628,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in ProfileElement) { if (elem != null) yield return elem; } - foreach (var elem in MustSupportElement) { if (elem != null) yield return elem; } - foreach (var elem in CodeFilter) { if (elem != null) yield return elem; } - foreach (var elem in DateFilter) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in ProfileElement) { if (elem != null) yield return new ElementValue("profile", elem); } - foreach (var elem in MustSupportElement) { if (elem != null) yield return new ElementValue("mustSupport", elem); } - foreach (var elem in CodeFilter) { if (elem != null) yield return new ElementValue("codeFilter", elem); } - foreach (var elem in DateFilter) { if (elem != null) yield return new ElementValue("dateFilter", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -731,7 +653,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -756,7 +678,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs b/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs index 9565c5185e..b32079b921 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DetectedIssue.cs @@ -212,31 +212,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Action != null) yield return Action; - if (DateElement != null) yield return DateElement; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Action != null) yield return new ElementValue("action", Action); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -255,7 +231,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -274,7 +250,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action is not null) yield return new KeyValuePair("action",Action); @@ -605,47 +581,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - if (Category != null) yield return Category; - if (SeverityElement != null) yield return SeverityElement; - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (Author != null) yield return Author; - foreach (var elem in Implicated) { if (elem != null) yield return elem; } - if (DetailElement != null) yield return DetailElement; - if (ReferenceElement != null) yield return ReferenceElement; - foreach (var elem in Mitigation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Category != null) yield return new ElementValue("category", Category); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Implicated) { if (elem != null) yield return new ElementValue("implicated", elem); } - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - foreach (var elem in Mitigation) { if (elem != null) yield return new ElementValue("mitigation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -688,7 +624,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -731,7 +667,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Device.cs b/src/Hl7.Fhir.STU3/Model/Generated/Device.cs index 5580aaa184..57c9d34dca 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Device.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Device.cs @@ -435,39 +435,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DeviceIdentifierElement != null) yield return DeviceIdentifierElement; - if (NameElement != null) yield return NameElement; - if (JurisdictionElement != null) yield return JurisdictionElement; - if (CarrierHRFElement != null) yield return CarrierHRFElement; - if (CarrierAIDCElement != null) yield return CarrierAIDCElement; - if (IssuerElement != null) yield return IssuerElement; - if (EntryTypeElement != null) yield return EntryTypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DeviceIdentifierElement != null) yield return new ElementValue("deviceIdentifier", DeviceIdentifierElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (JurisdictionElement != null) yield return new ElementValue("jurisdiction", JurisdictionElement); - if (CarrierHRFElement != null) yield return new ElementValue("carrierHRF", CarrierHRFElement); - if (CarrierAIDCElement != null) yield return new ElementValue("carrierAIDC", CarrierAIDCElement); - if (IssuerElement != null) yield return new ElementValue("issuer", IssuerElement); - if (EntryTypeElement != null) yield return new ElementValue("entryType", EntryTypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -498,7 +466,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -529,7 +497,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DeviceIdentifierElement is not null) yield return new KeyValuePair("deviceIdentifier",DeviceIdentifierElement); @@ -1014,59 +982,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Udi != null) yield return Udi; - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (LotNumberElement != null) yield return LotNumberElement; - if (ManufacturerElement != null) yield return ManufacturerElement; - if (ManufactureDateElement != null) yield return ManufactureDateElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (ModelElement != null) yield return ModelElement; - if (VersionElement != null) yield return VersionElement; - if (Patient != null) yield return Patient; - if (Owner != null) yield return Owner; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Safety) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Udi != null) yield return new ElementValue("udi", Udi); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ManufacturerElement != null) yield return new ElementValue("manufacturer", ManufacturerElement); - if (ManufactureDateElement != null) yield return new ElementValue("manufactureDate", ManufactureDateElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (ModelElement != null) yield return new ElementValue("model", ModelElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Owner != null) yield return new ElementValue("owner", Owner); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Location != null) yield return new ElementValue("location", Location); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Safety) { if (elem != null) yield return new ElementValue("safety", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1127,7 +1043,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1188,7 +1104,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs index d68d619928..702a2e2225 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceComponent.cs @@ -258,31 +258,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SpecType != null) yield return SpecType; - if (ComponentId != null) yield return ComponentId; - if (ProductionSpecElement != null) yield return ProductionSpecElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SpecType != null) yield return new ElementValue("specType", SpecType); - if (ComponentId != null) yield return new ElementValue("componentId", ComponentId); - if (ProductionSpecElement != null) yield return new ElementValue("productionSpec", ProductionSpecElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -301,7 +277,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -320,7 +296,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SpecType is not null) yield return new KeyValuePair("specType",SpecType); @@ -581,45 +557,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Type != null) yield return Type; - if (LastSystemChangeElement != null) yield return LastSystemChangeElement; - if (Source != null) yield return Source; - if (Parent != null) yield return Parent; - foreach (var elem in OperationalStatus) { if (elem != null) yield return elem; } - if (ParameterGroup != null) yield return ParameterGroup; - if (MeasurementPrincipleElement != null) yield return MeasurementPrincipleElement; - foreach (var elem in ProductionSpecification) { if (elem != null) yield return elem; } - if (LanguageCode != null) yield return LanguageCode; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Type != null) yield return new ElementValue("type", Type); - if (LastSystemChangeElement != null) yield return new ElementValue("lastSystemChange", LastSystemChangeElement); - if (Source != null) yield return new ElementValue("source", Source); - if (Parent != null) yield return new ElementValue("parent", Parent); - foreach (var elem in OperationalStatus) { if (elem != null) yield return new ElementValue("operationalStatus", elem); } - if (ParameterGroup != null) yield return new ElementValue("parameterGroup", ParameterGroup); - if (MeasurementPrincipleElement != null) yield return new ElementValue("measurementPrinciple", MeasurementPrincipleElement); - foreach (var elem in ProductionSpecification) { if (elem != null) yield return new ElementValue("productionSpecification", elem); } - if (LanguageCode != null) yield return new ElementValue("languageCode", LanguageCode); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -659,7 +597,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -699,7 +637,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs index 5fc6135d83..e40755e8f7 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceMetric.cs @@ -412,31 +412,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (StateElement != null) yield return StateElement; - if (TimeElement != null) yield return TimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (StateElement != null) yield return new ElementValue("state", StateElement); - if (TimeElement != null) yield return new ElementValue("time", TimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -455,7 +431,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -474,7 +450,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -755,45 +731,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Type != null) yield return Type; - if (Unit != null) yield return Unit; - if (Source != null) yield return Source; - if (Parent != null) yield return Parent; - if (OperationalStatusElement != null) yield return OperationalStatusElement; - if (ColorElement != null) yield return ColorElement; - if (CategoryElement != null) yield return CategoryElement; - if (MeasurementPeriod != null) yield return MeasurementPeriod; - foreach (var elem in Calibration) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Type != null) yield return new ElementValue("type", Type); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Source != null) yield return new ElementValue("source", Source); - if (Parent != null) yield return new ElementValue("parent", Parent); - if (OperationalStatusElement != null) yield return new ElementValue("operationalStatus", OperationalStatusElement); - if (ColorElement != null) yield return new ElementValue("color", ColorElement); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - if (MeasurementPeriod != null) yield return new ElementValue("measurementPeriod", MeasurementPeriod); - foreach (var elem in Calibration) { if (elem != null) yield return new ElementValue("calibration", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -833,7 +771,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -873,7 +811,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs index 63893be528..0cf2b6d0c3 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceRequest.cs @@ -151,29 +151,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Agent != null) yield return Agent; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Agent != null) yield return new ElementValue("agent", Agent); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -189,7 +167,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -205,7 +183,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Agent is not null) yield return new KeyValuePair("agent",Agent); @@ -688,67 +666,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PriorRequest) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (Intent != null) yield return Intent; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (PerformerType != null) yield return PerformerType; - if (Performer != null) yield return Performer; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PriorRequest) { if (elem != null) yield return new ElementValue("priorRequest", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Intent != null) yield return new ElementValue("intent", Intent); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -821,7 +739,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -894,7 +812,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs index 43e0773168..3cc037b97a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DeviceUseStatement.cs @@ -375,47 +375,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (WhenUsed != null) yield return WhenUsed; - if (Timing != null) yield return Timing; - if (RecordedOnElement != null) yield return RecordedOnElement; - if (Source != null) yield return Source; - if (Device != null) yield return Device; - foreach (var elem in Indication) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (WhenUsed != null) yield return new ElementValue("whenUsed", WhenUsed); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (RecordedOnElement != null) yield return new ElementValue("recordedOn", RecordedOnElement); - if (Source != null) yield return new ElementValue("source", Source); - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in Indication) { if (elem != null) yield return new ElementValue("indication", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -458,7 +418,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -501,7 +461,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs index 1d6a6d1edb..2bd8bdcaa1 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DiagnosticReport.cs @@ -221,29 +221,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -259,7 +237,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -275,7 +253,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -392,29 +370,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CommentElement != null) yield return CommentElement; - if (Link != null) yield return Link; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (Link != null) yield return new ElementValue("link", Link); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -430,7 +386,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -446,7 +402,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CommentElement is not null) yield return new KeyValuePair("comment",CommentElement); @@ -852,59 +808,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Effective != null) yield return Effective; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - foreach (var elem in Result) { if (elem != null) yield return elem; } - foreach (var elem in ImagingStudy) { if (elem != null) yield return elem; } - foreach (var elem in Image) { if (elem != null) yield return elem; } - if (ConclusionElement != null) yield return ConclusionElement; - foreach (var elem in CodedDiagnosis) { if (elem != null) yield return elem; } - foreach (var elem in PresentedForm) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - foreach (var elem in Result) { if (elem != null) yield return new ElementValue("result", elem); } - foreach (var elem in ImagingStudy) { if (elem != null) yield return new ElementValue("imagingStudy", elem); } - foreach (var elem in Image) { if (elem != null) yield return new ElementValue("image", elem); } - if (ConclusionElement != null) yield return new ElementValue("conclusion", ConclusionElement); - foreach (var elem in CodedDiagnosis) { if (elem != null) yield return new ElementValue("codedDiagnosis", elem); } - foreach (var elem in PresentedForm) { if (elem != null) yield return new ElementValue("presentedForm", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -965,7 +869,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1026,7 +930,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs b/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs index 3ff6f9ff2e..efa402d113 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DocumentManifest.cs @@ -134,27 +134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (P != null) yield return P; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (P != null) yield return new ElementValue("p", P); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -167,7 +147,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -180,7 +160,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (P is not null) yield return new KeyValuePair("p",P); @@ -278,29 +258,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Ref != null) yield return Ref; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Ref != null) yield return new ElementValue("ref", Ref); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -316,7 +274,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -332,7 +290,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -661,49 +619,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MasterIdentifier != null) yield return MasterIdentifier; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (CreatedElement != null) yield return CreatedElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - if (SourceElement != null) yield return SourceElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Content) { if (elem != null) yield return elem; } - foreach (var elem in Related) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MasterIdentifier != null) yield return new ElementValue("masterIdentifier", MasterIdentifier); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -749,7 +665,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -795,7 +711,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MasterIdentifier is not null) yield return new KeyValuePair("masterIdentifier",MasterIdentifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs b/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs index 12a01d891e..388c7a1e56 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/DocumentReference.cs @@ -171,29 +171,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -209,7 +187,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -225,7 +203,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -323,29 +301,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Attachment != null) yield return Attachment; - if (Format != null) yield return Format; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Attachment != null) yield return new ElementValue("attachment", Attachment); - if (Format != null) yield return new ElementValue("format", Format); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -361,7 +317,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -377,7 +333,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Attachment is not null) yield return new KeyValuePair("attachment",Attachment); @@ -563,39 +519,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Encounter != null) yield return Encounter; - foreach (var elem in Event) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (FacilityType != null) yield return FacilityType; - if (PracticeSetting != null) yield return PracticeSetting; - if (SourcePatientInfo != null) yield return SourcePatientInfo; - foreach (var elem in Related) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - foreach (var elem in Event) { if (elem != null) yield return new ElementValue("event", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (FacilityType != null) yield return new ElementValue("facilityType", FacilityType); - if (PracticeSetting != null) yield return new ElementValue("practiceSetting", PracticeSetting); - if (SourcePatientInfo != null) yield return new ElementValue("sourcePatientInfo", SourcePatientInfo); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -626,7 +550,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -657,7 +581,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Encounter is not null) yield return new KeyValuePair("encounter",Encounter); @@ -761,29 +685,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Ref != null) yield return Ref; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Ref != null) yield return new ElementValue("ref", Ref); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -799,7 +701,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -815,7 +717,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1250,59 +1152,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (MasterIdentifier != null) yield return MasterIdentifier; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (DocStatusElement != null) yield return DocStatusElement; - if (Type != null) yield return Type; - if (Class != null) yield return Class; - if (Subject != null) yield return Subject; - if (CreatedElement != null) yield return CreatedElement; - if (IndexedElement != null) yield return IndexedElement; - foreach (var elem in Author) { if (elem != null) yield return elem; } - if (Authenticator != null) yield return Authenticator; - if (Custodian != null) yield return Custodian; - foreach (var elem in RelatesTo) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in SecurityLabel) { if (elem != null) yield return elem; } - foreach (var elem in Content) { if (elem != null) yield return elem; } - if (Context != null) yield return Context; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (MasterIdentifier != null) yield return new ElementValue("masterIdentifier", MasterIdentifier); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (DocStatusElement != null) yield return new ElementValue("docStatus", DocStatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Class != null) yield return new ElementValue("class", Class); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (IndexedElement != null) yield return new ElementValue("indexed", IndexedElement); - foreach (var elem in Author) { if (elem != null) yield return new ElementValue("author", elem); } - if (Authenticator != null) yield return new ElementValue("authenticator", Authenticator); - if (Custodian != null) yield return new ElementValue("custodian", Custodian); - foreach (var elem in RelatesTo) { if (elem != null) yield return new ElementValue("relatesTo", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in SecurityLabel) { if (elem != null) yield return new ElementValue("securityLabel", elem); } - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - if (Context != null) yield return new ElementValue("context", Context); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1363,7 +1213,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1424,7 +1274,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (MasterIdentifier is not null) yield return new KeyValuePair("masterIdentifier",MasterIdentifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Dosage.cs b/src/Hl7.Fhir.STU3/Model/Generated/Dosage.cs index d6f1082dba..d8fb5dbad2 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Dosage.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Dosage.cs @@ -388,53 +388,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (TextElement != null) yield return TextElement; - foreach (var elem in AdditionalInstruction) { if (elem != null) yield return elem; } - if (PatientInstructionElement != null) yield return PatientInstructionElement; - if (Timing != null) yield return Timing; - if (AsNeeded != null) yield return AsNeeded; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (Method != null) yield return Method; - if (Dose != null) yield return Dose; - if (MaxDosePerPeriod != null) yield return MaxDosePerPeriod; - if (MaxDosePerAdministration != null) yield return MaxDosePerAdministration; - if (MaxDosePerLifetime != null) yield return MaxDosePerLifetime; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - foreach (var elem in AdditionalInstruction) { if (elem != null) yield return new ElementValue("additionalInstruction", elem); } - if (PatientInstructionElement != null) yield return new ElementValue("patientInstruction", PatientInstructionElement); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (AsNeeded != null) yield return new ElementValue("asNeeded", AsNeeded); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (Method != null) yield return new ElementValue("method", Method); - if (Dose != null) yield return new ElementValue("dose", Dose); - if (MaxDosePerPeriod != null) yield return new ElementValue("maxDosePerPeriod", MaxDosePerPeriod); - if (MaxDosePerAdministration != null) yield return new ElementValue("maxDosePerAdministration", MaxDosePerAdministration); - if (MaxDosePerLifetime != null) yield return new ElementValue("maxDosePerLifetime", MaxDosePerLifetime); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -486,7 +440,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -538,7 +492,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs index 5d3fdcc191..28f01cbc31 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ElementDefinition.cs @@ -423,33 +423,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Discriminator) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (OrderedElement != null) yield return OrderedElement; - if (RulesElement != null) yield return RulesElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Discriminator) { if (elem != null) yield return new ElementValue("discriminator", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (OrderedElement != null) yield return new ElementValue("ordered", OrderedElement); - if (RulesElement != null) yield return new ElementValue("rules", RulesElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -471,7 +445,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -493,7 +467,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Discriminator?.Any() == true) yield return new KeyValuePair("discriminator",Discriminator); @@ -632,29 +606,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (PathElement != null) yield return PathElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -670,7 +622,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -686,7 +638,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -856,31 +808,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -899,7 +827,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -918,7 +846,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -1161,35 +1089,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (ProfileElement != null) yield return ProfileElement; - if (TargetProfileElement != null) yield return TargetProfileElement; - foreach (var elem in AggregationElement) { if (elem != null) yield return elem; } - if (VersioningElement != null) yield return VersioningElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - if (TargetProfileElement != null) yield return new ElementValue("targetProfile", TargetProfileElement); - foreach (var elem in AggregationElement) { if (elem != null) yield return new ElementValue("aggregation", elem); } - if (VersioningElement != null) yield return new ElementValue("versioning", VersioningElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1214,7 +1114,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1239,7 +1139,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1361,29 +1261,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LabelElement != null) yield return LabelElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1399,7 +1277,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1415,7 +1293,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LabelElement is not null) yield return new KeyValuePair("label",LabelElement); @@ -1727,39 +1605,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KeyElement != null) yield return KeyElement; - if (RequirementsElement != null) yield return RequirementsElement; - if (SeverityElement != null) yield return SeverityElement; - if (HumanElement != null) yield return HumanElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (XpathElement != null) yield return XpathElement; - if (SourceElement != null) yield return SourceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KeyElement != null) yield return new ElementValue("key", KeyElement); - if (RequirementsElement != null) yield return new ElementValue("requirements", RequirementsElement); - if (SeverityElement != null) yield return new ElementValue("severity", SeverityElement); - if (HumanElement != null) yield return new ElementValue("human", HumanElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (XpathElement != null) yield return new ElementValue("xpath", XpathElement); - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1790,7 +1636,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1821,7 +1667,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KeyElement is not null) yield return new KeyValuePair("key",KeyElement); @@ -1983,31 +1829,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StrengthElement != null) yield return StrengthElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (ValueSet != null) yield return ValueSet; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StrengthElement != null) yield return new ElementValue("strength", StrengthElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ValueSet != null) yield return new ElementValue("valueSet", ValueSet); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2026,7 +1848,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2045,7 +1867,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StrengthElement is not null) yield return new KeyValuePair("strength",StrengthElement); @@ -2252,33 +2074,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentityElement != null) yield return IdentityElement; - if (LanguageElement != null) yield return LanguageElement; - if (MapElement != null) yield return MapElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentityElement != null) yield return new ElementValue("identity", IdentityElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (MapElement != null) yield return new ElementValue("map", MapElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2300,7 +2096,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2322,7 +2118,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentityElement is not null) yield return new KeyValuePair("identity",IdentityElement); @@ -3248,89 +3044,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - foreach (var elem in RepresentationElement) { if (elem != null) yield return elem; } - if (SliceNameElement != null) yield return SliceNameElement; - if (LabelElement != null) yield return LabelElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (Slicing != null) yield return Slicing; - if (ShortElement != null) yield return ShortElement; - if (DefinitionElement != null) yield return DefinitionElement; - if (CommentElement != null) yield return CommentElement; - if (RequirementsElement != null) yield return RequirementsElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (Base != null) yield return Base; - if (ContentReferenceElement != null) yield return ContentReferenceElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (DefaultValue != null) yield return DefaultValue; - if (MeaningWhenMissingElement != null) yield return MeaningWhenMissingElement; - if (OrderMeaningElement != null) yield return OrderMeaningElement; - if (Fixed != null) yield return Fixed; - if (Pattern != null) yield return Pattern; - foreach (var elem in Example) { if (elem != null) yield return elem; } - if (MinValue != null) yield return MinValue; - if (MaxValue != null) yield return MaxValue; - if (MaxLengthElement != null) yield return MaxLengthElement; - foreach (var elem in ConditionElement) { if (elem != null) yield return elem; } - foreach (var elem in Constraint) { if (elem != null) yield return elem; } - if (MustSupportElement != null) yield return MustSupportElement; - if (IsModifierElement != null) yield return IsModifierElement; - if (IsSummaryElement != null) yield return IsSummaryElement; - if (Binding != null) yield return Binding; - foreach (var elem in Mapping) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - foreach (var elem in RepresentationElement) { if (elem != null) yield return new ElementValue("representation", elem); } - if (SliceNameElement != null) yield return new ElementValue("sliceName", SliceNameElement); - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (Slicing != null) yield return new ElementValue("slicing", Slicing); - if (ShortElement != null) yield return new ElementValue("short", ShortElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (RequirementsElement != null) yield return new ElementValue("requirements", RequirementsElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (Base != null) yield return new ElementValue("base", Base); - if (ContentReferenceElement != null) yield return new ElementValue("contentReference", ContentReferenceElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (DefaultValue != null) yield return new ElementValue("defaultValue", DefaultValue); - if (MeaningWhenMissingElement != null) yield return new ElementValue("meaningWhenMissing", MeaningWhenMissingElement); - if (OrderMeaningElement != null) yield return new ElementValue("orderMeaning", OrderMeaningElement); - if (Fixed != null) yield return new ElementValue("fixed", Fixed); - if (Pattern != null) yield return new ElementValue("pattern", Pattern); - foreach (var elem in Example) { if (elem != null) yield return new ElementValue("example", elem); } - if (MinValue != null) yield return new ElementValue("minValue", MinValue); - if (MaxValue != null) yield return new ElementValue("maxValue", MaxValue); - if (MaxLengthElement != null) yield return new ElementValue("maxLength", MaxLengthElement); - foreach (var elem in ConditionElement) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Constraint) { if (elem != null) yield return new ElementValue("constraint", elem); } - if (MustSupportElement != null) yield return new ElementValue("mustSupport", MustSupportElement); - if (IsModifierElement != null) yield return new ElementValue("isModifier", IsModifierElement); - if (IsSummaryElement != null) yield return new ElementValue("isSummary", IsSummaryElement); - if (Binding != null) yield return new ElementValue("binding", Binding); - foreach (var elem in Mapping) { if (elem != null) yield return new ElementValue("mapping", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3436,7 +3150,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3542,7 +3256,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs index 307fb0c02a..d9b866a8c4 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityRequest.cs @@ -416,55 +416,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Priority != null) yield return Priority; - if (Patient != null) yield return Patient; - if (Serviced != null) yield return Serviced; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Provider != null) yield return Provider; - if (Organization != null) yield return Organization; - if (Insurer != null) yield return Insurer; - if (Facility != null) yield return Facility; - if (Coverage != null) yield return Coverage; - if (BusinessArrangementElement != null) yield return BusinessArrangementElement; - if (BenefitCategory != null) yield return BenefitCategory; - if (BenefitSubCategory != null) yield return BenefitSubCategory; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Facility != null) yield return new ElementValue("facility", Facility); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (BusinessArrangementElement != null) yield return new ElementValue("businessArrangement", BusinessArrangementElement); - if (BenefitCategory != null) yield return new ElementValue("benefitCategory", BenefitCategory); - if (BenefitSubCategory != null) yield return new ElementValue("benefitSubCategory", BenefitSubCategory); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -519,7 +471,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -574,7 +526,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs index 7d1eca272c..76225c52cc 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EligibilityResponse.cs @@ -167,31 +167,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Coverage != null) yield return Coverage; - if (Contract != null) yield return Contract; - foreach (var elem in BenefitBalance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - if (Contract != null) yield return new ElementValue("contract", Contract); - foreach (var elem in BenefitBalance) { if (elem != null) yield return new ElementValue("benefitBalance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +186,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -229,7 +205,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coverage is not null) yield return new KeyValuePair("coverage",Coverage); @@ -499,43 +475,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (SubCategory != null) yield return SubCategory; - if (ExcludedElement != null) yield return ExcludedElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Network != null) yield return Network; - if (Unit != null) yield return Unit; - if (Term != null) yield return Term; - foreach (var elem in Financial) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (SubCategory != null) yield return new ElementValue("subCategory", SubCategory); - if (ExcludedElement != null) yield return new ElementValue("excluded", ExcludedElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Network != null) yield return new ElementValue("network", Network); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Term != null) yield return new ElementValue("term", Term); - foreach (var elem in Financial) { if (elem != null) yield return new ElementValue("financial", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -572,7 +512,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -609,7 +549,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -734,31 +674,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Allowed != null) yield return Allowed; - if (Used != null) yield return Used; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Used != null) yield return new ElementValue("used", Used); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -777,7 +693,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -796,7 +712,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -879,27 +795,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -912,7 +808,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -925,7 +821,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1269,51 +1165,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CreatedElement != null) yield return CreatedElement; - if (RequestProvider != null) yield return RequestProvider; - if (RequestOrganization != null) yield return RequestOrganization; - if (Request != null) yield return Request; - if (Outcome != null) yield return Outcome; - if (DispositionElement != null) yield return DispositionElement; - if (Insurer != null) yield return Insurer; - if (InforceElement != null) yield return InforceElement; - foreach (var elem in Insurance) { if (elem != null) yield return elem; } - if (Form != null) yield return Form; - foreach (var elem in Error) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (RequestProvider != null) yield return new ElementValue("requestProvider", RequestProvider); - if (RequestOrganization != null) yield return new ElementValue("requestOrganization", RequestOrganization); - if (Request != null) yield return new ElementValue("request", Request); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (InforceElement != null) yield return new ElementValue("inforce", InforceElement); - foreach (var elem in Insurance) { if (elem != null) yield return new ElementValue("insurance", elem); } - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1362,7 +1214,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1411,7 +1263,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs b/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs index b64c7a3aee..39acf0c15d 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Encounter.cs @@ -269,29 +269,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -307,7 +285,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -323,7 +301,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); @@ -423,29 +401,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Class != null) yield return Class; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Class != null) yield return new ElementValue("class", Class); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -461,7 +417,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -477,7 +433,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Class is not null) yield return new KeyValuePair("class",Class); @@ -593,31 +549,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Individual != null) yield return Individual; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Individual != null) yield return new ElementValue("individual", Individual); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -636,7 +568,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -655,7 +587,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -787,31 +719,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Condition != null) yield return Condition; - if (Role != null) yield return Role; - if (RankElement != null) yield return RankElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Role != null) yield return new ElementValue("role", Role); - if (RankElement != null) yield return new ElementValue("rank", RankElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -830,7 +738,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -849,7 +757,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Condition is not null) yield return new KeyValuePair("condition",Condition); @@ -1072,43 +980,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PreAdmissionIdentifier != null) yield return PreAdmissionIdentifier; - if (Origin != null) yield return Origin; - if (AdmitSource != null) yield return AdmitSource; - if (ReAdmission != null) yield return ReAdmission; - foreach (var elem in DietPreference) { if (elem != null) yield return elem; } - foreach (var elem in SpecialCourtesy) { if (elem != null) yield return elem; } - foreach (var elem in SpecialArrangement) { if (elem != null) yield return elem; } - if (Destination != null) yield return Destination; - if (DischargeDisposition != null) yield return DischargeDisposition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PreAdmissionIdentifier != null) yield return new ElementValue("preAdmissionIdentifier", PreAdmissionIdentifier); - if (Origin != null) yield return new ElementValue("origin", Origin); - if (AdmitSource != null) yield return new ElementValue("admitSource", AdmitSource); - if (ReAdmission != null) yield return new ElementValue("reAdmission", ReAdmission); - foreach (var elem in DietPreference) { if (elem != null) yield return new ElementValue("dietPreference", elem); } - foreach (var elem in SpecialCourtesy) { if (elem != null) yield return new ElementValue("specialCourtesy", elem); } - foreach (var elem in SpecialArrangement) { if (elem != null) yield return new ElementValue("specialArrangement", elem); } - if (Destination != null) yield return new ElementValue("destination", Destination); - if (DischargeDisposition != null) yield return new ElementValue("dischargeDisposition", DischargeDisposition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1145,7 +1017,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1182,7 +1054,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PreAdmissionIdentifier is not null) yield return new KeyValuePair("preAdmissionIdentifier",PreAdmissionIdentifier); @@ -1325,31 +1197,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Location != null) yield return Location; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Location != null) yield return new ElementValue("location", Location); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1368,7 +1216,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1387,7 +1235,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Location is not null) yield return new KeyValuePair("location",Location); @@ -1824,67 +1672,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusHistory) { if (elem != null) yield return elem; } - if (Class != null) yield return Class; - foreach (var elem in ClassHistory) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (Priority != null) yield return Priority; - if (Subject != null) yield return Subject; - foreach (var elem in EpisodeOfCare) { if (elem != null) yield return elem; } - foreach (var elem in IncomingReferral) { if (elem != null) yield return elem; } - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Appointment != null) yield return Appointment; - if (Period != null) yield return Period; - if (Length != null) yield return Length; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - if (Hospitalization != null) yield return Hospitalization; - foreach (var elem in Location) { if (elem != null) yield return elem; } - if (ServiceProvider != null) yield return ServiceProvider; - if (PartOf != null) yield return PartOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusHistory) { if (elem != null) yield return new ElementValue("statusHistory", elem); } - if (Class != null) yield return new ElementValue("class", Class); - foreach (var elem in ClassHistory) { if (elem != null) yield return new ElementValue("classHistory", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in EpisodeOfCare) { if (elem != null) yield return new ElementValue("episodeOfCare", elem); } - foreach (var elem in IncomingReferral) { if (elem != null) yield return new ElementValue("incomingReferral", elem); } - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Appointment != null) yield return new ElementValue("appointment", Appointment); - if (Period != null) yield return new ElementValue("period", Period); - if (Length != null) yield return new ElementValue("length", Length); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - if (Hospitalization != null) yield return new ElementValue("hospitalization", Hospitalization); - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - if (ServiceProvider != null) yield return new ElementValue("serviceProvider", ServiceProvider); - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1957,7 +1745,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2030,7 +1818,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs b/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs index 50813b9012..0c5cca3f1e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Endpoint.cs @@ -427,47 +427,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ConnectionType != null) yield return ConnectionType; - if (NameElement != null) yield return NameElement; - if (ManagingOrganization != null) yield return ManagingOrganization; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - foreach (var elem in PayloadType) { if (elem != null) yield return elem; } - foreach (var elem in PayloadMimeTypeElement) { if (elem != null) yield return elem; } - if (AddressElement != null) yield return AddressElement; - foreach (var elem in HeaderElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ConnectionType != null) yield return new ElementValue("connectionType", ConnectionType); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in PayloadType) { if (elem != null) yield return new ElementValue("payloadType", elem); } - foreach (var elem in PayloadMimeTypeElement) { if (elem != null) yield return new ElementValue("payloadMimeType", elem); } - if (AddressElement != null) yield return new ElementValue("address", AddressElement); - foreach (var elem in HeaderElement) { if (elem != null) yield return new ElementValue("header", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -510,7 +470,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -553,7 +513,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs index 9adb299b3c..c9d3b9888a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentRequest.cs @@ -277,41 +277,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CreatedElement != null) yield return CreatedElement; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Organization != null) yield return Organization; - if (Subject != null) yield return Subject; - if (Coverage != null) yield return Coverage; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -345,7 +311,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -379,7 +345,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs index a32569060f..1e266b9f5b 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EnrollmentResponse.cs @@ -310,43 +310,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Request != null) yield return Request; - if (Outcome != null) yield return Outcome; - if (DispositionElement != null) yield return DispositionElement; - if (CreatedElement != null) yield return CreatedElement; - if (Organization != null) yield return Organization; - if (RequestProvider != null) yield return RequestProvider; - if (RequestOrganization != null) yield return RequestOrganization; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Request != null) yield return new ElementValue("request", Request); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (RequestProvider != null) yield return new ElementValue("requestProvider", RequestProvider); - if (RequestOrganization != null) yield return new ElementValue("requestOrganization", RequestOrganization); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -383,7 +347,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -420,7 +384,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs b/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs index 73b3836fcb..aa6c868bcb 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/EpisodeOfCare.cs @@ -220,29 +220,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -258,7 +236,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -274,7 +252,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); @@ -405,31 +383,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Condition != null) yield return Condition; - if (Role != null) yield return Role; - if (RankElement != null) yield return RankElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Role != null) yield return new ElementValue("role", Role); - if (RankElement != null) yield return new ElementValue("rank", RankElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -448,7 +402,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -467,7 +421,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Condition is not null) yield return new KeyValuePair("condition",Condition); @@ -752,49 +706,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in StatusHistory) { if (elem != null) yield return elem; } - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (Period != null) yield return Period; - foreach (var elem in ReferralRequest) { if (elem != null) yield return elem; } - if (CareManager != null) yield return CareManager; - foreach (var elem in Team) { if (elem != null) yield return elem; } - foreach (var elem in Account) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in StatusHistory) { if (elem != null) yield return new ElementValue("statusHistory", elem); } - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in ReferralRequest) { if (elem != null) yield return new ElementValue("referralRequest", elem); } - if (CareManager != null) yield return new ElementValue("careManager", CareManager); - foreach (var elem in Team) { if (elem != null) yield return new ElementValue("team", elem); } - foreach (var elem in Account) { if (elem != null) yield return new ElementValue("account", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -840,7 +752,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -886,7 +798,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs b/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs index 47cf7b195a..8dea4af69f 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ExpansionProfile.cs @@ -249,31 +249,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemElement != null) yield return SystemElement; - if (VersionElement != null) yield return VersionElement; - if (ModeElement != null) yield return ModeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -292,7 +268,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -311,7 +287,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemElement is not null) yield return new KeyValuePair("system",SystemElement); @@ -446,29 +422,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemElement != null) yield return SystemElement; - if (VersionElement != null) yield return VersionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -484,7 +438,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -500,7 +454,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemElement is not null) yield return new KeyValuePair("system",SystemElement); @@ -596,29 +550,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Include != null) yield return Include; - if (Exclude != null) yield return Exclude; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Include != null) yield return new ElementValue("include", Include); - if (Exclude != null) yield return new ElementValue("exclude", Exclude); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -634,7 +566,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -650,7 +582,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Include is not null) yield return new KeyValuePair("include",Include); @@ -728,27 +660,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Designation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Designation) { if (elem != null) yield return new ElementValue("designation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -761,7 +673,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -774,7 +686,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Designation?.Any() == true) yield return new KeyValuePair("designation",Designation); @@ -890,29 +802,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LanguageElement != null) yield return LanguageElement; - if (Use != null) yield return Use; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (Use != null) yield return new ElementValue("use", Use); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -928,7 +818,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -944,7 +834,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LanguageElement is not null) yield return new KeyValuePair("language",LanguageElement); @@ -1022,27 +912,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Designation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Designation) { if (elem != null) yield return new ElementValue("designation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1055,7 +925,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1068,7 +938,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Designation?.Any() == true) yield return new KeyValuePair("designation",Designation); @@ -1184,29 +1054,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LanguageElement != null) yield return LanguageElement; - if (Use != null) yield return Use; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (Use != null) yield return new ElementValue("use", Use); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1222,7 +1070,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1238,7 +1086,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LanguageElement is not null) yield return new KeyValuePair("language",LanguageElement); @@ -1953,71 +1801,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in FixedVersion) { if (elem != null) yield return elem; } - if (ExcludedSystem != null) yield return ExcludedSystem; - if (IncludeDesignationsElement != null) yield return IncludeDesignationsElement; - if (Designation != null) yield return Designation; - if (IncludeDefinitionElement != null) yield return IncludeDefinitionElement; - if (ActiveOnlyElement != null) yield return ActiveOnlyElement; - if (ExcludeNestedElement != null) yield return ExcludeNestedElement; - if (ExcludeNotForUIElement != null) yield return ExcludeNotForUIElement; - if (ExcludePostCoordinatedElement != null) yield return ExcludePostCoordinatedElement; - if (DisplayLanguageElement != null) yield return DisplayLanguageElement; - if (LimitedExpansionElement != null) yield return LimitedExpansionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in FixedVersion) { if (elem != null) yield return new ElementValue("fixedVersion", elem); } - if (ExcludedSystem != null) yield return new ElementValue("excludedSystem", ExcludedSystem); - if (IncludeDesignationsElement != null) yield return new ElementValue("includeDesignations", IncludeDesignationsElement); - if (Designation != null) yield return new ElementValue("designation", Designation); - if (IncludeDefinitionElement != null) yield return new ElementValue("includeDefinition", IncludeDefinitionElement); - if (ActiveOnlyElement != null) yield return new ElementValue("activeOnly", ActiveOnlyElement); - if (ExcludeNestedElement != null) yield return new ElementValue("excludeNested", ExcludeNestedElement); - if (ExcludeNotForUIElement != null) yield return new ElementValue("excludeNotForUI", ExcludeNotForUIElement); - if (ExcludePostCoordinatedElement != null) yield return new ElementValue("excludePostCoordinated", ExcludePostCoordinatedElement); - if (DisplayLanguageElement != null) yield return new ElementValue("displayLanguage", DisplayLanguageElement); - if (LimitedExpansionElement != null) yield return new ElementValue("limitedExpansion", LimitedExpansionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2096,7 +1880,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2175,7 +1959,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs b/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs index 97e5d27d03..9ec824d747 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ExplanationOfBenefit.cs @@ -356,31 +356,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Claim != null) yield return Claim; - if (Relationship != null) yield return Relationship; - if (Reference != null) yield return Reference; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Claim != null) yield return new ElementValue("claim", Claim); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (Reference != null) yield return new ElementValue("reference", Reference); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -399,7 +375,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -418,7 +394,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Claim is not null) yield return new KeyValuePair("claim",Claim); @@ -535,31 +511,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ResourceType != null) yield return ResourceType; - if (Party != null) yield return Party; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ResourceType != null) yield return new ElementValue("resourceType", ResourceType); - if (Party != null) yield return new ElementValue("party", Party); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -578,7 +530,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -597,7 +549,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -786,37 +738,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Timing != null) yield return Timing; - if (Value != null) yield return Value; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Timing != null) yield return new ElementValue("timing", Timing); - if (Value != null) yield return new ElementValue("value", Value); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -844,7 +766,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -872,7 +794,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1062,35 +984,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Provider != null) yield return Provider; - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Role != null) yield return Role; - if (Qualification != null) yield return Qualification; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Role != null) yield return new ElementValue("role", Role); - if (Qualification != null) yield return new ElementValue("qualification", Qualification); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1115,7 +1009,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1140,7 +1034,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1298,33 +1192,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Diagnosis != null) yield return Diagnosis; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (PackageCode != null) yield return PackageCode; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Diagnosis != null) yield return new ElementValue("diagnosis", Diagnosis); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (PackageCode != null) yield return new ElementValue("packageCode", PackageCode); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1346,7 +1214,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1368,7 +1236,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1524,31 +1392,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (DateElement != null) yield return DateElement; - if (Procedure != null) yield return Procedure; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1567,7 +1411,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1586,7 +1430,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -1704,29 +1548,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Coverage != null) yield return Coverage; - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Coverage != null) yield return new ElementValue("coverage", Coverage); - foreach (var elem in PreAuthRefElement) { if (elem != null) yield return new ElementValue("preAuthRef", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1742,7 +1564,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1758,7 +1580,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Coverage is not null) yield return new KeyValuePair("coverage",Coverage); @@ -1892,31 +1714,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Type != null) yield return Type; - if (Location != null) yield return Location; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Location != null) yield return new ElementValue("location", Location); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1935,7 +1733,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1954,7 +1752,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -2543,71 +2341,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - foreach (var elem in CareTeamLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in DiagnosisLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in ProcedureLinkIdElement) { if (elem != null) yield return elem; } - foreach (var elem in InformationLinkIdElement) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Serviced != null) yield return Serviced; - if (Location != null) yield return Location; - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - foreach (var elem in SubSite) { if (elem != null) yield return elem; } - foreach (var elem in Encounter) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - foreach (var elem in CareTeamLinkIdElement) { if (elem != null) yield return new ElementValue("careTeamLinkId", elem); } - foreach (var elem in DiagnosisLinkIdElement) { if (elem != null) yield return new ElementValue("diagnosisLinkId", elem); } - foreach (var elem in ProcedureLinkIdElement) { if (elem != null) yield return new ElementValue("procedureLinkId", elem); } - foreach (var elem in InformationLinkIdElement) { if (elem != null) yield return new ElementValue("informationLinkId", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Serviced != null) yield return new ElementValue("serviced", Serviced); - if (Location != null) yield return new ElementValue("location", Location); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - foreach (var elem in SubSite) { if (elem != null) yield return new ElementValue("subSite", elem); } - foreach (var elem in Encounter) { if (elem != null) yield return new ElementValue("encounter", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2686,7 +2420,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2765,7 +2499,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -2935,33 +2669,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Reason != null) yield return Reason; - if (Amount != null) yield return Amount; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2983,7 +2691,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3005,7 +2713,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -3381,55 +3089,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Type != null) yield return Type; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in SubDetail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in SubDetail) { if (elem != null) yield return new ElementValue("subDetail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3484,7 +3144,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3539,7 +3199,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -3909,53 +3569,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceElement != null) yield return SequenceElement; - if (Type != null) yield return Type; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - foreach (var elem in ProgramCode) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (UnitPrice != null) yield return UnitPrice; - if (FactorElement != null) yield return FactorElement; - if (Net != null) yield return Net; - foreach (var elem in Udi) { if (elem != null) yield return elem; } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceElement != null) yield return new ElementValue("sequence", SequenceElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ProgramCode) { if (elem != null) yield return new ElementValue("programCode", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (UnitPrice != null) yield return new ElementValue("unitPrice", UnitPrice); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (Net != null) yield return new ElementValue("net", Net); - foreach (var elem in Udi) { if (elem != null) yield return new ElementValue("udi", elem); } - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4007,7 +3621,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4059,7 +3673,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceElement is not null) yield return new KeyValuePair("sequence",SequenceElement); @@ -4324,43 +3938,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in SequenceLinkIdElement) { if (elem != null) yield return elem; } - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Fee != null) yield return Fee; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - foreach (var elem in Detail) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in SequenceLinkIdElement) { if (elem != null) yield return new ElementValue("sequenceLinkId", elem); } - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Fee != null) yield return new ElementValue("fee", Fee); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4397,7 +3975,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4434,7 +4012,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceLinkIdElement?.Any() == true) yield return new KeyValuePair("sequenceLinkId",SequenceLinkIdElement); @@ -4642,39 +4220,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Revenue != null) yield return Revenue; - if (Category != null) yield return Category; - if (Service != null) yield return Service; - foreach (var elem in Modifier) { if (elem != null) yield return elem; } - if (Fee != null) yield return Fee; - foreach (var elem in NoteNumberElement) { if (elem != null) yield return elem; } - foreach (var elem in Adjudication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Revenue != null) yield return new ElementValue("revenue", Revenue); - if (Category != null) yield return new ElementValue("category", Category); - if (Service != null) yield return new ElementValue("service", Service); - foreach (var elem in Modifier) { if (elem != null) yield return new ElementValue("modifier", elem); } - if (Fee != null) yield return new ElementValue("fee", Fee); - foreach (var elem in NoteNumberElement) { if (elem != null) yield return new ElementValue("noteNumber", elem); } - foreach (var elem in Adjudication) { if (elem != null) yield return new ElementValue("adjudication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4705,7 +4251,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4736,7 +4282,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Revenue is not null) yield return new KeyValuePair("revenue",Revenue); @@ -4921,37 +4467,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Adjustment != null) yield return Adjustment; - if (AdjustmentReason != null) yield return AdjustmentReason; - if (DateElement != null) yield return DateElement; - if (Amount != null) yield return Amount; - if (Identifier != null) yield return Identifier; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Adjustment != null) yield return new ElementValue("adjustment", Adjustment); - if (AdjustmentReason != null) yield return new ElementValue("adjustmentReason", AdjustmentReason); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4979,7 +4495,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5007,7 +4523,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -5177,33 +4693,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NumberElement != null) yield return NumberElement; - if (Type != null) yield return Type; - if (TextElement != null) yield return TextElement; - if (Language != null) yield return Language; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (Type != null) yield return new ElementValue("type", Type); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Language != null) yield return new ElementValue("language", Language); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5225,7 +4715,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5247,7 +4737,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NumberElement is not null) yield return new KeyValuePair("number",NumberElement); @@ -5515,43 +5005,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (SubCategory != null) yield return SubCategory; - if (ExcludedElement != null) yield return ExcludedElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Network != null) yield return Network; - if (Unit != null) yield return Unit; - if (Term != null) yield return Term; - foreach (var elem in Financial) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (SubCategory != null) yield return new ElementValue("subCategory", SubCategory); - if (ExcludedElement != null) yield return new ElementValue("excluded", ExcludedElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Network != null) yield return new ElementValue("network", Network); - if (Unit != null) yield return new ElementValue("unit", Unit); - if (Term != null) yield return new ElementValue("term", Term); - foreach (var elem in Financial) { if (elem != null) yield return new ElementValue("financial", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5588,7 +5042,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5625,7 +5079,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -5750,31 +5204,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Allowed != null) yield return Allowed; - if (Used != null) yield return Used; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Allowed != null) yield return new ElementValue("allowed", Allowed); - if (Used != null) yield return new ElementValue("used", Used); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5793,7 +5223,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5812,7 +5242,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -6598,103 +6028,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - foreach (var elem in SubType) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (BillablePeriod != null) yield return BillablePeriod; - if (CreatedElement != null) yield return CreatedElement; - if (Enterer != null) yield return Enterer; - if (Insurer != null) yield return Insurer; - if (Provider != null) yield return Provider; - if (Organization != null) yield return Organization; - if (Referral != null) yield return Referral; - if (Facility != null) yield return Facility; - if (Claim != null) yield return Claim; - if (ClaimResponse != null) yield return ClaimResponse; - if (Outcome != null) yield return Outcome; - if (DispositionElement != null) yield return DispositionElement; - foreach (var elem in Related) { if (elem != null) yield return elem; } - if (Prescription != null) yield return Prescription; - if (OriginalPrescription != null) yield return OriginalPrescription; - if (Payee != null) yield return Payee; - foreach (var elem in Information) { if (elem != null) yield return elem; } - foreach (var elem in CareTeam) { if (elem != null) yield return elem; } - foreach (var elem in Diagnosis) { if (elem != null) yield return elem; } - foreach (var elem in Procedure) { if (elem != null) yield return elem; } - if (PrecedenceElement != null) yield return PrecedenceElement; - if (Insurance != null) yield return Insurance; - if (Accident != null) yield return Accident; - if (EmploymentImpacted != null) yield return EmploymentImpacted; - if (Hospitalization != null) yield return Hospitalization; - foreach (var elem in Item) { if (elem != null) yield return elem; } - foreach (var elem in AddItem) { if (elem != null) yield return elem; } - if (TotalCost != null) yield return TotalCost; - if (UnallocDeductable != null) yield return UnallocDeductable; - if (TotalBenefit != null) yield return TotalBenefit; - if (Payment != null) yield return Payment; - if (Form != null) yield return Form; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - foreach (var elem in BenefitBalance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in SubType) { if (elem != null) yield return new ElementValue("subType", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (BillablePeriod != null) yield return new ElementValue("billablePeriod", BillablePeriod); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Insurer != null) yield return new ElementValue("insurer", Insurer); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Referral != null) yield return new ElementValue("referral", Referral); - if (Facility != null) yield return new ElementValue("facility", Facility); - if (Claim != null) yield return new ElementValue("claim", Claim); - if (ClaimResponse != null) yield return new ElementValue("claimResponse", ClaimResponse); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - if (Prescription != null) yield return new ElementValue("prescription", Prescription); - if (OriginalPrescription != null) yield return new ElementValue("originalPrescription", OriginalPrescription); - if (Payee != null) yield return new ElementValue("payee", Payee); - foreach (var elem in Information) { if (elem != null) yield return new ElementValue("information", elem); } - foreach (var elem in CareTeam) { if (elem != null) yield return new ElementValue("careTeam", elem); } - foreach (var elem in Diagnosis) { if (elem != null) yield return new ElementValue("diagnosis", elem); } - foreach (var elem in Procedure) { if (elem != null) yield return new ElementValue("procedure", elem); } - if (PrecedenceElement != null) yield return new ElementValue("precedence", PrecedenceElement); - if (Insurance != null) yield return new ElementValue("insurance", Insurance); - if (Accident != null) yield return new ElementValue("accident", Accident); - if (EmploymentImpacted != null) yield return new ElementValue("employmentImpacted", EmploymentImpacted); - if (Hospitalization != null) yield return new ElementValue("hospitalization", Hospitalization); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - foreach (var elem in AddItem) { if (elem != null) yield return new ElementValue("addItem", elem); } - if (TotalCost != null) yield return new ElementValue("totalCost", TotalCost); - if (UnallocDeductable != null) yield return new ElementValue("unallocDeductable", UnallocDeductable); - if (TotalBenefit != null) yield return new ElementValue("totalBenefit", TotalBenefit); - if (Payment != null) yield return new ElementValue("payment", Payment); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - foreach (var elem in BenefitBalance) { if (elem != null) yield return new ElementValue("benefitBalance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6821,7 +6155,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6948,7 +6282,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs b/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs index 67190ae965..48e878cb3d 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/FamilyMemberHistory.cs @@ -219,33 +219,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Outcome != null) yield return Outcome; - if (Onset != null) yield return Onset; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (Onset != null) yield return new ElementValue("onset", Onset); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -267,7 +241,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -289,7 +263,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -765,61 +739,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (NotDoneElement != null) yield return NotDoneElement; - if (NotDoneReason != null) yield return NotDoneReason; - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (NameElement != null) yield return NameElement; - if (Relationship != null) yield return Relationship; - if (GenderElement != null) yield return GenderElement; - if (Born != null) yield return Born; - if (Age != null) yield return Age; - if (EstimatedAgeElement != null) yield return EstimatedAgeElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (NotDoneElement != null) yield return new ElementValue("notDone", NotDoneElement); - if (NotDoneReason != null) yield return new ElementValue("notDoneReason", NotDoneReason); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (Born != null) yield return new ElementValue("born", Born); - if (Age != null) yield return new ElementValue("age", Age); - if (EstimatedAgeElement != null) yield return new ElementValue("estimatedAge", EstimatedAgeElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -883,7 +803,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -947,7 +867,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs b/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs index fb775872be..2b6cc96799 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Flag.cs @@ -288,41 +288,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Period != null) yield return Period; - if (Encounter != null) yield return Encounter; - if (Author != null) yield return Author; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Period != null) yield return new ElementValue("period", Period); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (Author != null) yield return new ElementValue("author", Author); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -356,7 +322,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -390,7 +356,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs b/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs index 32e51f61eb..913313f7df 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Goal.cs @@ -257,31 +257,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Measure != null) yield return Measure; - if (Detail != null) yield return Detail; - if (Due != null) yield return Due; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Measure != null) yield return new ElementValue("measure", Measure); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (Due != null) yield return new ElementValue("due", Due); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -300,7 +276,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -319,7 +295,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Measure is not null) yield return new KeyValuePair("measure",Measure); @@ -689,55 +665,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Priority != null) yield return Priority; - if (Description != null) yield return Description; - if (Subject != null) yield return Subject; - if (Start != null) yield return Start; - if (Target != null) yield return Target; - if (StatusDateElement != null) yield return StatusDateElement; - if (StatusReasonElement != null) yield return StatusReasonElement; - if (ExpressedBy != null) yield return ExpressedBy; - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeCode) { if (elem != null) yield return elem; } - foreach (var elem in OutcomeReference) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Description != null) yield return new ElementValue("description", Description); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Start != null) yield return new ElementValue("start", Start); - if (Target != null) yield return new ElementValue("target", Target); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (StatusReasonElement != null) yield return new ElementValue("statusReason", StatusReasonElement); - if (ExpressedBy != null) yield return new ElementValue("expressedBy", ExpressedBy); - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in OutcomeCode) { if (elem != null) yield return new ElementValue("outcomeCode", elem); } - foreach (var elem in OutcomeReference) { if (elem != null) yield return new ElementValue("outcomeReference", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -792,7 +720,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -847,7 +775,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs index 7de3466d94..ddad6dc017 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/GraphDefinition.cs @@ -333,37 +333,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PathElement != null) yield return PathElement; - if (SliceNameElement != null) yield return SliceNameElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SliceNameElement != null) yield return new ElementValue("sliceName", SliceNameElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -391,7 +361,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -419,7 +389,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PathElement is not null) yield return new KeyValuePair("path",PathElement); @@ -589,33 +559,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ProfileElement != null) yield return ProfileElement; - foreach (var elem in Compartment) { if (elem != null) yield return elem; } - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - foreach (var elem in Compartment) { if (elem != null) yield return new ElementValue("compartment", elem); } - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -637,7 +581,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -659,7 +603,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -864,33 +808,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (RuleElement != null) yield return RuleElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (RuleElement != null) yield return new ElementValue("rule", RuleElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -912,7 +830,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -934,7 +852,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -1434,55 +1352,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (StartElement != null) yield return StartElement; - if (ProfileElement != null) yield return ProfileElement; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (ProfileElement != null) yield return new ElementValue("profile", ProfileElement); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1537,7 +1407,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1592,7 +1462,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Group.cs b/src/Hl7.Fhir.STU3/Model/Generated/Group.cs index 25861612d2..0ea98ad44a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Group.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Group.cs @@ -250,33 +250,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (ExcludeElement != null) yield return ExcludeElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (ExcludeElement != null) yield return new ElementValue("exclude", ExcludeElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -298,7 +272,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -320,7 +294,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -455,31 +429,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Entity != null) yield return Entity; - if (Period != null) yield return Period; - if (InactiveElement != null) yield return InactiveElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Entity != null) yield return new ElementValue("entity", Entity); - if (Period != null) yield return new ElementValue("period", Period); - if (InactiveElement != null) yield return new ElementValue("inactive", InactiveElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -498,7 +448,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -517,7 +467,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Entity is not null) yield return new KeyValuePair("entity",Entity); @@ -810,43 +760,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (TypeElement != null) yield return TypeElement; - if (ActualElement != null) yield return ActualElement; - if (Code != null) yield return Code; - if (NameElement != null) yield return NameElement; - if (QuantityElement != null) yield return QuantityElement; - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in Member) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ActualElement != null) yield return new ElementValue("actual", ActualElement); - if (Code != null) yield return new ElementValue("code", Code); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (QuantityElement != null) yield return new ElementValue("quantity", QuantityElement); - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in Member) { if (elem != null) yield return new ElementValue("member", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -883,7 +797,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -920,7 +834,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs index 528e51fd0a..5c0f6edd18 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/GuidanceResponse.cs @@ -448,53 +448,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RequestIdElement != null) yield return RequestIdElement; - if (Identifier != null) yield return Identifier; - if (Module != null) yield return Module; - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (OccurrenceDateTimeElement != null) yield return OccurrenceDateTimeElement; - if (Performer != null) yield return Performer; - if (Reason != null) yield return Reason; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in EvaluationMessage) { if (elem != null) yield return elem; } - if (OutputParameters != null) yield return OutputParameters; - if (Result != null) yield return Result; - foreach (var elem in DataRequirement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RequestIdElement != null) yield return new ElementValue("requestId", RequestIdElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Module != null) yield return new ElementValue("module", Module); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (OccurrenceDateTimeElement != null) yield return new ElementValue("occurrenceDateTime", OccurrenceDateTimeElement); - if (Performer != null) yield return new ElementValue("performer", Performer); - if (Reason != null) yield return new ElementValue("reason", Reason); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in EvaluationMessage) { if (elem != null) yield return new ElementValue("evaluationMessage", elem); } - if (OutputParameters != null) yield return new ElementValue("outputParameters", OutputParameters); - if (Result != null) yield return new ElementValue("result", Result); - foreach (var elem in DataRequirement) { if (elem != null) yield return new ElementValue("dataRequirement", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -546,7 +500,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -598,7 +552,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RequestIdElement is not null) yield return new KeyValuePair("requestId",RequestIdElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs b/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs index c8633add82..84a2537780 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/HealthcareService.cs @@ -251,33 +251,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return elem; } - if (AllDayElement != null) yield return AllDayElement; - if (AvailableStartTimeElement != null) yield return AvailableStartTimeElement; - if (AvailableEndTimeElement != null) yield return AvailableEndTimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return new ElementValue("daysOfWeek", elem); } - if (AllDayElement != null) yield return new ElementValue("allDay", AllDayElement); - if (AvailableStartTimeElement != null) yield return new ElementValue("availableStartTime", AvailableStartTimeElement); - if (AvailableEndTimeElement != null) yield return new ElementValue("availableEndTime", AvailableEndTimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -299,7 +273,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -321,7 +295,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DaysOfWeekElement?.Any() == true) yield return new KeyValuePair("daysOfWeek",DaysOfWeekElement); @@ -438,29 +412,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (During != null) yield return During; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (During != null) yield return new ElementValue("during", During); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -476,7 +428,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -492,7 +444,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -1098,73 +1050,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (ProvidedBy != null) yield return ProvidedBy; - if (Category != null) yield return Category; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - if (CommentElement != null) yield return CommentElement; - if (ExtraDetailsElement != null) yield return ExtraDetailsElement; - if (Photo != null) yield return Photo; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in CoverageArea) { if (elem != null) yield return elem; } - foreach (var elem in ServiceProvisionCode) { if (elem != null) yield return elem; } - if (Eligibility != null) yield return Eligibility; - if (EligibilityNoteElement != null) yield return EligibilityNoteElement; - foreach (var elem in ProgramNameElement) { if (elem != null) yield return elem; } - foreach (var elem in Characteristic) { if (elem != null) yield return elem; } - foreach (var elem in ReferralMethod) { if (elem != null) yield return elem; } - if (AppointmentRequiredElement != null) yield return AppointmentRequiredElement; - foreach (var elem in AvailableTime) { if (elem != null) yield return elem; } - foreach (var elem in NotAvailable) { if (elem != null) yield return elem; } - if (AvailabilityExceptionsElement != null) yield return AvailabilityExceptionsElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (ProvidedBy != null) yield return new ElementValue("providedBy", ProvidedBy); - if (Category != null) yield return new ElementValue("category", Category); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (ExtraDetailsElement != null) yield return new ElementValue("extraDetails", ExtraDetailsElement); - if (Photo != null) yield return new ElementValue("photo", Photo); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in CoverageArea) { if (elem != null) yield return new ElementValue("coverageArea", elem); } - foreach (var elem in ServiceProvisionCode) { if (elem != null) yield return new ElementValue("serviceProvisionCode", elem); } - if (Eligibility != null) yield return new ElementValue("eligibility", Eligibility); - if (EligibilityNoteElement != null) yield return new ElementValue("eligibilityNote", EligibilityNoteElement); - foreach (var elem in ProgramNameElement) { if (elem != null) yield return new ElementValue("programName", elem); } - foreach (var elem in Characteristic) { if (elem != null) yield return new ElementValue("characteristic", elem); } - foreach (var elem in ReferralMethod) { if (elem != null) yield return new ElementValue("referralMethod", elem); } - if (AppointmentRequiredElement != null) yield return new ElementValue("appointmentRequired", AppointmentRequiredElement); - foreach (var elem in AvailableTime) { if (elem != null) yield return new ElementValue("availableTime", elem); } - foreach (var elem in NotAvailable) { if (elem != null) yield return new ElementValue("notAvailable", elem); } - if (AvailabilityExceptionsElement != null) yield return new ElementValue("availabilityExceptions", AvailabilityExceptionsElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1246,7 +1132,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1328,7 +1214,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/HumanName.cs b/src/Hl7.Fhir.STU3/Model/Generated/HumanName.cs index de4e8f8582..355ded3038 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/HumanName.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/HumanName.cs @@ -376,39 +376,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UseElement != null) yield return UseElement; - if (TextElement != null) yield return TextElement; - if (FamilyElement != null) yield return FamilyElement; - foreach (var elem in GivenElement) { if (elem != null) yield return elem; } - foreach (var elem in PrefixElement) { if (elem != null) yield return elem; } - foreach (var elem in SuffixElement) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (FamilyElement != null) yield return new ElementValue("family", FamilyElement); - foreach (var elem in GivenElement) { if (elem != null) yield return new ElementValue("given", elem); } - foreach (var elem in PrefixElement) { if (elem != null) yield return new ElementValue("prefix", elem); } - foreach (var elem in SuffixElement) { if (elem != null) yield return new ElementValue("suffix", elem); } - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -439,7 +407,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -470,7 +438,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UseElement is not null) yield return new KeyValuePair("use",UseElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs index d618a41183..e054d8dab5 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ImagingManifest.cs @@ -204,33 +204,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (ImagingStudy != null) yield return ImagingStudy; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - foreach (var elem in Series) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (ImagingStudy != null) yield return new ElementValue("imagingStudy", ImagingStudy); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - foreach (var elem in Series) { if (elem != null) yield return new ElementValue("series", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -252,7 +226,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -274,7 +248,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -412,31 +386,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -455,7 +405,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -474,7 +424,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -610,29 +560,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SopClassElement != null) yield return SopClassElement; - if (UidElement != null) yield return UidElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SopClassElement != null) yield return new ElementValue("sopClass", SopClassElement); - if (UidElement != null) yield return new ElementValue("uid", UidElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -648,7 +576,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -664,7 +592,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SopClassElement is not null) yield return new KeyValuePair("sopClass",SopClassElement); @@ -852,37 +780,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Patient != null) yield return Patient; - if (AuthoringTimeElement != null) yield return AuthoringTimeElement; - if (Author != null) yield return Author; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Study) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (AuthoringTimeElement != null) yield return new ElementValue("authoringTime", AuthoringTimeElement); - if (Author != null) yield return new ElementValue("author", Author); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Study) { if (elem != null) yield return new ElementValue("study", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -910,7 +808,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -938,7 +836,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs index 945ad7232c..7c6af2028e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ImagingStudy.cs @@ -462,49 +462,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (NumberElement != null) yield return NumberElement; - if (Modality != null) yield return Modality; - if (DescriptionElement != null) yield return DescriptionElement; - if (NumberOfInstancesElement != null) yield return NumberOfInstancesElement; - if (AvailabilityElement != null) yield return AvailabilityElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (Laterality != null) yield return Laterality; - if (StartedElement != null) yield return StartedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in Instance) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (Modality != null) yield return new ElementValue("modality", Modality); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (NumberOfInstancesElement != null) yield return new ElementValue("numberOfInstances", NumberOfInstancesElement); - if (AvailabilityElement != null) yield return new ElementValue("availability", AvailabilityElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Laterality != null) yield return new ElementValue("laterality", Laterality); - if (StartedElement != null) yield return new ElementValue("started", StartedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -550,7 +508,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -596,7 +554,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -808,33 +766,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (NumberElement != null) yield return NumberElement; - if (SopClassElement != null) yield return SopClassElement; - if (TitleElement != null) yield return TitleElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (NumberElement != null) yield return new ElementValue("number", NumberElement); - if (SopClassElement != null) yield return new ElementValue("sopClass", SopClassElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -856,7 +788,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -878,7 +810,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); @@ -1371,63 +1303,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UidElement != null) yield return UidElement; - if (Accession != null) yield return Accession; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (AvailabilityElement != null) yield return AvailabilityElement; - foreach (var elem in ModalityList) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - if (Context != null) yield return Context; - if (StartedElement != null) yield return StartedElement; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (Referrer != null) yield return Referrer; - foreach (var elem in Interpreter) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - if (NumberOfSeriesElement != null) yield return NumberOfSeriesElement; - if (NumberOfInstancesElement != null) yield return NumberOfInstancesElement; - foreach (var elem in ProcedureReference) { if (elem != null) yield return elem; } - foreach (var elem in ProcedureCode) { if (elem != null) yield return elem; } - if (Reason != null) yield return Reason; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Series) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UidElement != null) yield return new ElementValue("uid", UidElement); - if (Accession != null) yield return new ElementValue("accession", Accession); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (AvailabilityElement != null) yield return new ElementValue("availability", AvailabilityElement); - foreach (var elem in ModalityList) { if (elem != null) yield return new ElementValue("modalityList", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Context != null) yield return new ElementValue("context", Context); - if (StartedElement != null) yield return new ElementValue("started", StartedElement); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (Referrer != null) yield return new ElementValue("referrer", Referrer); - foreach (var elem in Interpreter) { if (elem != null) yield return new ElementValue("interpreter", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - if (NumberOfSeriesElement != null) yield return new ElementValue("numberOfSeries", NumberOfSeriesElement); - if (NumberOfInstancesElement != null) yield return new ElementValue("numberOfInstances", NumberOfInstancesElement); - foreach (var elem in ProcedureReference) { if (elem != null) yield return new ElementValue("procedureReference", elem); } - foreach (var elem in ProcedureCode) { if (elem != null) yield return new ElementValue("procedureCode", elem); } - if (Reason != null) yield return new ElementValue("reason", Reason); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Series) { if (elem != null) yield return new ElementValue("series", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1494,7 +1370,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1561,7 +1437,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UidElement is not null) yield return new KeyValuePair("uid",UidElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs b/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs index b2c6067657..1d9dcaefea 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Immunization.cs @@ -172,29 +172,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Actor != null) yield return Actor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Actor != null) yield return new ElementValue("actor", Actor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -210,7 +188,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -226,7 +204,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -326,29 +304,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in ReasonNotGiven) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in ReasonNotGiven) { if (elem != null) yield return new ElementValue("reasonNotGiven", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -364,7 +320,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -380,7 +336,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Reason?.Any() == true) yield return new KeyValuePair("reason",Reason); @@ -531,31 +487,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (Detail != null) yield return Detail; - if (ReportedElement != null) yield return ReportedElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (ReportedElement != null) yield return new ElementValue("reported", ReportedElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -574,7 +506,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -593,7 +525,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -865,41 +797,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DoseSequenceElement != null) yield return DoseSequenceElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Authority != null) yield return Authority; - if (SeriesElement != null) yield return SeriesElement; - if (SeriesDosesElement != null) yield return SeriesDosesElement; - foreach (var elem in TargetDisease) { if (elem != null) yield return elem; } - if (DoseStatus != null) yield return DoseStatus; - if (DoseStatusReason != null) yield return DoseStatusReason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DoseSequenceElement != null) yield return new ElementValue("doseSequence", DoseSequenceElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - if (SeriesDosesElement != null) yield return new ElementValue("seriesDoses", SeriesDosesElement); - foreach (var elem in TargetDisease) { if (elem != null) yield return new ElementValue("targetDisease", elem); } - if (DoseStatus != null) yield return new ElementValue("doseStatus", DoseStatus); - if (DoseStatusReason != null) yield return new ElementValue("doseStatusReason", DoseStatusReason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -933,7 +831,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -967,7 +865,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DoseSequenceElement is not null) yield return new KeyValuePair("doseSequence",DoseSequenceElement); @@ -1491,67 +1389,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (NotGivenElement != null) yield return NotGivenElement; - if (VaccineCode != null) yield return VaccineCode; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - if (PrimarySourceElement != null) yield return PrimarySourceElement; - if (ReportOrigin != null) yield return ReportOrigin; - if (Location != null) yield return Location; - if (Manufacturer != null) yield return Manufacturer; - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (DoseQuantity != null) yield return DoseQuantity; - foreach (var elem in Practitioner) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Explanation != null) yield return Explanation; - foreach (var elem in Reaction) { if (elem != null) yield return elem; } - foreach (var elem in VaccinationProtocol) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (NotGivenElement != null) yield return new ElementValue("notGiven", NotGivenElement); - if (VaccineCode != null) yield return new ElementValue("vaccineCode", VaccineCode); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PrimarySourceElement != null) yield return new ElementValue("primarySource", PrimarySourceElement); - if (ReportOrigin != null) yield return new ElementValue("reportOrigin", ReportOrigin); - if (Location != null) yield return new ElementValue("location", Location); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (DoseQuantity != null) yield return new ElementValue("doseQuantity", DoseQuantity); - foreach (var elem in Practitioner) { if (elem != null) yield return new ElementValue("practitioner", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Explanation != null) yield return new ElementValue("explanation", Explanation); - foreach (var elem in Reaction) { if (elem != null) yield return new ElementValue("reaction", elem); } - foreach (var elem in VaccinationProtocol) { if (elem != null) yield return new ElementValue("vaccinationProtocol", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1624,7 +1462,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1697,7 +1535,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs index ba644883c4..f6387634b2 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ImmunizationRecommendation.cs @@ -303,43 +303,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DateElement != null) yield return DateElement; - if (VaccineCode != null) yield return VaccineCode; - if (TargetDisease != null) yield return TargetDisease; - if (DoseNumberElement != null) yield return DoseNumberElement; - if (ForecastStatus != null) yield return ForecastStatus; - foreach (var elem in DateCriterion) { if (elem != null) yield return elem; } - if (Protocol != null) yield return Protocol; - foreach (var elem in SupportingImmunization) { if (elem != null) yield return elem; } - foreach (var elem in SupportingPatientInformation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (VaccineCode != null) yield return new ElementValue("vaccineCode", VaccineCode); - if (TargetDisease != null) yield return new ElementValue("targetDisease", TargetDisease); - if (DoseNumberElement != null) yield return new ElementValue("doseNumber", DoseNumberElement); - if (ForecastStatus != null) yield return new ElementValue("forecastStatus", ForecastStatus); - foreach (var elem in DateCriterion) { if (elem != null) yield return new ElementValue("dateCriterion", elem); } - if (Protocol != null) yield return new ElementValue("protocol", Protocol); - foreach (var elem in SupportingImmunization) { if (elem != null) yield return new ElementValue("supportingImmunization", elem); } - foreach (var elem in SupportingPatientInformation) { if (elem != null) yield return new ElementValue("supportingPatientInformation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -376,7 +340,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -413,7 +377,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DateElement is not null) yield return new KeyValuePair("date",DateElement); @@ -537,29 +501,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -575,7 +517,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -591,7 +533,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -775,33 +717,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DoseSequenceElement != null) yield return DoseSequenceElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (Authority != null) yield return Authority; - if (SeriesElement != null) yield return SeriesElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DoseSequenceElement != null) yield return new ElementValue("doseSequence", DoseSequenceElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Authority != null) yield return new ElementValue("authority", Authority); - if (SeriesElement != null) yield return new ElementValue("series", SeriesElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -823,7 +739,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -845,7 +761,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DoseSequenceElement is not null) yield return new KeyValuePair("doseSequence",DoseSequenceElement); @@ -950,31 +866,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Patient != null) yield return Patient; - foreach (var elem in Recommendation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Patient != null) yield return new ElementValue("patient", Patient); - foreach (var elem in Recommendation) { if (elem != null) yield return new ElementValue("recommendation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -993,7 +885,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1012,7 +904,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs b/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs index 58aac8268e..aaf8a8676e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ImplementationGuide.cs @@ -266,29 +266,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (UriElement != null) yield return UriElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -304,7 +282,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -320,7 +298,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -470,31 +448,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Resource) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Resource) { if (elem != null) yield return new ElementValue("resource", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -513,7 +467,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -532,7 +486,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -772,37 +726,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ExampleElement != null) yield return ExampleElement; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (AcronymElement != null) yield return AcronymElement; - if (Source != null) yield return Source; - if (ExampleFor != null) yield return ExampleFor; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ExampleElement != null) yield return new ElementValue("example", ExampleElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (AcronymElement != null) yield return new ElementValue("acronym", AcronymElement); - if (Source != null) yield return new ElementValue("source", Source); - if (ExampleFor != null) yield return new ElementValue("exampleFor", ExampleFor); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -830,7 +754,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -858,7 +782,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ExampleElement is not null) yield return new KeyValuePair("example",ExampleElement); @@ -983,29 +907,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Profile != null) yield return Profile; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1021,7 +923,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1037,7 +939,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1333,39 +1235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SourceElement != null) yield return SourceElement; - if (TitleElement != null) yield return TitleElement; - if (KindElement != null) yield return KindElement; - foreach (var elem in TypeElement) { if (elem != null) yield return elem; } - foreach (var elem in PackageElement) { if (elem != null) yield return elem; } - if (FormatElement != null) yield return FormatElement; - foreach (var elem in Page) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SourceElement != null) yield return new ElementValue("source", SourceElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - foreach (var elem in TypeElement) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in PackageElement) { if (elem != null) yield return new ElementValue("package", elem); } - if (FormatElement != null) yield return new ElementValue("format", FormatElement); - foreach (var elem in Page) { if (elem != null) yield return new ElementValue("page", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1396,7 +1266,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1427,7 +1297,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SourceElement is not null) yield return new KeyValuePair("source",SourceElement); @@ -1979,61 +1849,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - if (FhirVersionElement != null) yield return FhirVersionElement; - foreach (var elem in Dependency) { if (elem != null) yield return elem; } - foreach (var elem in Package) { if (elem != null) yield return elem; } - foreach (var elem in Global) { if (elem != null) yield return elem; } - foreach (var elem in BinaryElement) { if (elem != null) yield return elem; } - if (Page != null) yield return Page; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (FhirVersionElement != null) yield return new ElementValue("fhirVersion", FhirVersionElement); - foreach (var elem in Dependency) { if (elem != null) yield return new ElementValue("dependency", elem); } - foreach (var elem in Package) { if (elem != null) yield return new ElementValue("package", elem); } - foreach (var elem in Global) { if (elem != null) yield return new ElementValue("global", elem); } - foreach (var elem in BinaryElement) { if (elem != null) yield return new ElementValue("binary", elem); } - if (Page != null) yield return new ElementValue("page", Page); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2097,7 +1913,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2161,7 +1977,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Library.cs b/src/Hl7.Fhir.STU3/Model/Generated/Library.cs index dd36aa991c..dc3e41e891 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Library.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Library.cs @@ -785,77 +785,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (Type != null) yield return Type; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in DataRequirement) { if (elem != null) yield return elem; } - foreach (var elem in Content) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (Type != null) yield return new ElementValue("type", Type); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in DataRequirement) { if (elem != null) yield return new ElementValue("dataRequirement", elem); } - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -943,7 +873,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1031,7 +961,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs b/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs index 50ba095ffd..3ad8f722df 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Linkage.cs @@ -196,29 +196,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -234,7 +212,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -250,7 +228,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -367,31 +345,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActiveElement != null) yield return ActiveElement; - if (Author != null) yield return Author; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Author != null) yield return new ElementValue("author", Author); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -410,7 +364,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -429,7 +383,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActiveElement is not null) yield return new KeyValuePair("active",ActiveElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/List.cs b/src/Hl7.Fhir.STU3/Model/Generated/List.cs index 65af37d3bc..79c7de9ce8 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/List.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/List.cs @@ -247,33 +247,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Flag != null) yield return Flag; - if (DeletedElement != null) yield return DeletedElement; - if (DateElement != null) yield return DateElement; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Flag != null) yield return new ElementValue("flag", Flag); - if (DeletedElement != null) yield return new ElementValue("deleted", DeletedElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -295,7 +269,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -317,7 +291,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Flag is not null) yield return new KeyValuePair("flag",Flag); @@ -667,51 +641,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ModeElement != null) yield return ModeElement; - if (TitleElement != null) yield return TitleElement; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Encounter != null) yield return Encounter; - if (DateElement != null) yield return DateElement; - if (Source != null) yield return Source; - if (OrderedBy != null) yield return OrderedBy; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Entry) { if (elem != null) yield return elem; } - if (EmptyReason != null) yield return EmptyReason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Source != null) yield return new ElementValue("source", Source); - if (OrderedBy != null) yield return new ElementValue("orderedBy", OrderedBy); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Entry) { if (elem != null) yield return new ElementValue("entry", elem); } - if (EmptyReason != null) yield return new ElementValue("emptyReason", EmptyReason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -760,7 +690,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -809,7 +739,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Location.cs b/src/Hl7.Fhir.STU3/Model/Generated/Location.cs index d73543d873..c3a5f2e1d7 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Location.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Location.cs @@ -268,31 +268,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LongitudeElement != null) yield return LongitudeElement; - if (LatitudeElement != null) yield return LatitudeElement; - if (AltitudeElement != null) yield return AltitudeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LongitudeElement != null) yield return new ElementValue("longitude", LongitudeElement); - if (LatitudeElement != null) yield return new ElementValue("latitude", LatitudeElement); - if (AltitudeElement != null) yield return new ElementValue("altitude", AltitudeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -311,7 +287,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -330,7 +306,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LongitudeElement is not null) yield return new KeyValuePair("longitude",LongitudeElement); @@ -728,55 +704,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (OperationalStatus != null) yield return OperationalStatus; - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (ModeElement != null) yield return ModeElement; - if (Type != null) yield return Type; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - if (PhysicalType != null) yield return PhysicalType; - if (Position != null) yield return Position; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (PartOf != null) yield return PartOf; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (OperationalStatus != null) yield return new ElementValue("operationalStatus", OperationalStatus); - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - if (PhysicalType != null) yield return new ElementValue("physicalType", PhysicalType); - if (Position != null) yield return new ElementValue("position", Position); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -831,7 +759,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -886,7 +814,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs b/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs index a8dea950bc..7fca180804 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Measure.cs @@ -233,35 +233,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Population) { if (elem != null) yield return elem; } - foreach (var elem in Stratifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - foreach (var elem in Stratifier) { if (elem != null) yield return new ElementValue("stratifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -286,7 +258,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -311,7 +283,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -514,35 +486,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Code != null) yield return Code; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (CriteriaElement != null) yield return CriteriaElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Code != null) yield return new ElementValue("code", Code); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (CriteriaElement != null) yield return new ElementValue("criteria", CriteriaElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -567,7 +511,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -592,7 +536,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -743,31 +687,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (CriteriaElement != null) yield return CriteriaElement; - if (PathElement != null) yield return PathElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (CriteriaElement != null) yield return new ElementValue("criteria", CriteriaElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -786,7 +706,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -805,7 +725,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -973,33 +893,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - foreach (var elem in Usage) { if (elem != null) yield return elem; } - if (CriteriaElement != null) yield return CriteriaElement; - if (PathElement != null) yield return PathElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - foreach (var elem in Usage) { if (elem != null) yield return new ElementValue("usage", elem); } - if (CriteriaElement != null) yield return new ElementValue("criteria", CriteriaElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1021,7 +915,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1043,7 +937,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -2123,99 +2017,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Library) { if (elem != null) yield return elem; } - if (DisclaimerElement != null) yield return DisclaimerElement; - if (Scoring != null) yield return Scoring; - if (CompositeScoring != null) yield return CompositeScoring; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (RiskAdjustmentElement != null) yield return RiskAdjustmentElement; - if (RateAggregationElement != null) yield return RateAggregationElement; - if (RationaleElement != null) yield return RationaleElement; - if (ClinicalRecommendationStatementElement != null) yield return ClinicalRecommendationStatementElement; - if (ImprovementNotationElement != null) yield return ImprovementNotationElement; - foreach (var elem in DefinitionElement) { if (elem != null) yield return elem; } - if (GuidanceElement != null) yield return GuidanceElement; - if (SetElement != null) yield return SetElement; - foreach (var elem in Group) { if (elem != null) yield return elem; } - foreach (var elem in SupplementalData) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Library) { if (elem != null) yield return new ElementValue("library", elem); } - if (DisclaimerElement != null) yield return new ElementValue("disclaimer", DisclaimerElement); - if (Scoring != null) yield return new ElementValue("scoring", Scoring); - if (CompositeScoring != null) yield return new ElementValue("compositeScoring", CompositeScoring); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (RiskAdjustmentElement != null) yield return new ElementValue("riskAdjustment", RiskAdjustmentElement); - if (RateAggregationElement != null) yield return new ElementValue("rateAggregation", RateAggregationElement); - if (RationaleElement != null) yield return new ElementValue("rationale", RationaleElement); - if (ClinicalRecommendationStatementElement != null) yield return new ElementValue("clinicalRecommendationStatement", ClinicalRecommendationStatementElement); - if (ImprovementNotationElement != null) yield return new ElementValue("improvementNotation", ImprovementNotationElement); - foreach (var elem in DefinitionElement) { if (elem != null) yield return new ElementValue("definition", elem); } - if (GuidanceElement != null) yield return new ElementValue("guidance", GuidanceElement); - if (SetElement != null) yield return new ElementValue("set", SetElement); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - foreach (var elem in SupplementalData) { if (elem != null) yield return new ElementValue("supplementalData", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2336,7 +2138,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2457,7 +2259,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs index c0cef87fa3..d9bfbf7b75 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MeasureReport.cs @@ -255,33 +255,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - foreach (var elem in Population) { if (elem != null) yield return elem; } - if (MeasureScoreElement != null) yield return MeasureScoreElement; - foreach (var elem in Stratifier) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - if (MeasureScoreElement != null) yield return new ElementValue("measureScore", MeasureScoreElement); - foreach (var elem in Stratifier) { if (elem != null) yield return new ElementValue("stratifier", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -303,7 +277,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -325,7 +299,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -476,33 +450,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Code != null) yield return Code; - if (CountElement != null) yield return CountElement; - if (Patients != null) yield return Patients; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Code != null) yield return new ElementValue("code", Code); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (Patients != null) yield return new ElementValue("patients", Patients); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -524,7 +472,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -546,7 +494,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -645,29 +593,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - foreach (var elem in Stratum) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - foreach (var elem in Stratum) { if (elem != null) yield return new ElementValue("stratum", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -683,7 +609,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -699,7 +625,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -849,31 +775,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ValueElement != null) yield return ValueElement; - foreach (var elem in Population) { if (elem != null) yield return elem; } - if (MeasureScoreElement != null) yield return MeasureScoreElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - foreach (var elem in Population) { if (elem != null) yield return new ElementValue("population", elem); } - if (MeasureScoreElement != null) yield return new ElementValue("measureScore", MeasureScoreElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -892,7 +794,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -911,7 +813,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ValueElement is not null) yield return new KeyValuePair("value",ValueElement); @@ -1061,33 +963,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (Code != null) yield return Code; - if (CountElement != null) yield return CountElement; - if (Patients != null) yield return Patients; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (Code != null) yield return new ElementValue("code", Code); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (Patients != null) yield return new ElementValue("patients", Patients); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1109,7 +985,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1131,7 +1007,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -1414,45 +1290,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - if (TypeElement != null) yield return TypeElement; - if (Measure != null) yield return Measure; - if (Patient != null) yield return Patient; - if (DateElement != null) yield return DateElement; - if (ReportingOrganization != null) yield return ReportingOrganization; - if (Period != null) yield return Period; - foreach (var elem in Group) { if (elem != null) yield return elem; } - if (EvaluatedResources != null) yield return EvaluatedResources; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Measure != null) yield return new ElementValue("measure", Measure); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (ReportingOrganization != null) yield return new ElementValue("reportingOrganization", ReportingOrganization); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - if (EvaluatedResources != null) yield return new ElementValue("evaluatedResources", EvaluatedResources); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1492,7 +1330,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1532,7 +1370,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Media.cs b/src/Hl7.Fhir.STU3/Model/Generated/Media.cs index 6c2d90ccec..e47fe16006 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Media.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Media.cs @@ -527,61 +527,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (Subtype != null) yield return Subtype; - if (View != null) yield return View; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Occurrence != null) yield return Occurrence; - if (Operator != null) yield return Operator; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - if (BodySite != null) yield return BodySite; - if (Device != null) yield return Device; - if (HeightElement != null) yield return HeightElement; - if (WidthElement != null) yield return WidthElement; - if (FramesElement != null) yield return FramesElement; - if (DurationElement != null) yield return DurationElement; - if (Content != null) yield return Content; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Subtype != null) yield return new ElementValue("subtype", Subtype); - if (View != null) yield return new ElementValue("view", View); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (Operator != null) yield return new ElementValue("operator", Operator); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Device != null) yield return new ElementValue("device", Device); - if (HeightElement != null) yield return new ElementValue("height", HeightElement); - if (WidthElement != null) yield return new ElementValue("width", WidthElement); - if (FramesElement != null) yield return new ElementValue("frames", FramesElement); - if (DurationElement != null) yield return new ElementValue("duration", DurationElement); - if (Content != null) yield return new ElementValue("content", Content); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -645,7 +591,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -709,7 +655,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs b/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs index 113ab1a24b..a56e84167d 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Medication.cs @@ -213,31 +213,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (IsActiveElement != null) yield return IsActiveElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (IsActiveElement != null) yield return new ElementValue("isActive", IsActiveElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -256,7 +232,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -275,7 +251,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -391,31 +367,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Container != null) yield return Container; - foreach (var elem in Content) { if (elem != null) yield return elem; } - foreach (var elem in Batch) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Container != null) yield return new ElementValue("container", Container); - foreach (var elem in Content) { if (elem != null) yield return new ElementValue("content", elem); } - foreach (var elem in Batch) { if (elem != null) yield return new ElementValue("batch", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -434,7 +386,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -453,7 +405,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Container is not null) yield return new KeyValuePair("container",Container); @@ -554,29 +506,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Item != null) yield return Item; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Item != null) yield return new ElementValue("item", Item); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -592,7 +522,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -608,7 +538,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Item is not null) yield return new KeyValuePair("item",Item); @@ -740,29 +670,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LotNumberElement != null) yield return LotNumberElement; - if (ExpirationDateElement != null) yield return ExpirationDateElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LotNumberElement != null) yield return new ElementValue("lotNumber", LotNumberElement); - if (ExpirationDateElement != null) yield return new ElementValue("expirationDate", ExpirationDateElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -778,7 +686,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -794,7 +702,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LotNumberElement is not null) yield return new KeyValuePair("lotNumber",LotNumberElement); @@ -1048,43 +956,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (StatusElement != null) yield return StatusElement; - if (IsBrandElement != null) yield return IsBrandElement; - if (IsOverTheCounterElement != null) yield return IsOverTheCounterElement; - if (Manufacturer != null) yield return Manufacturer; - if (Form != null) yield return Form; - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - if (Package != null) yield return Package; - foreach (var elem in Image) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IsBrandElement != null) yield return new ElementValue("isBrand", IsBrandElement); - if (IsOverTheCounterElement != null) yield return new ElementValue("isOverTheCounter", IsOverTheCounterElement); - if (Manufacturer != null) yield return new ElementValue("manufacturer", Manufacturer); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - if (Package != null) yield return new ElementValue("package", Package); - foreach (var elem in Image) { if (elem != null) yield return new ElementValue("image", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1121,7 +993,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1158,7 +1030,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs index fae77cc61c..d22b322718 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationAdministration.cs @@ -198,29 +198,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Actor != null) yield return Actor; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Actor != null) yield return new ElementValue("actor", Actor); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -236,7 +214,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -252,7 +230,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Actor is not null) yield return new KeyValuePair("actor",Actor); @@ -435,37 +413,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TextElement != null) yield return TextElement; - if (Site != null) yield return Site; - if (Route != null) yield return Route; - if (Method != null) yield return Method; - if (Dose != null) yield return Dose; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Site != null) yield return new ElementValue("site", Site); - if (Route != null) yield return new ElementValue("route", Route); - if (Method != null) yield return new ElementValue("method", Method); - if (Dose != null) yield return new ElementValue("dose", Dose); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -493,7 +441,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -521,7 +469,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TextElement is not null) yield return new KeyValuePair("text",TextElement); @@ -975,65 +923,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Category != null) yield return Category; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (Effective != null) yield return Effective; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (NotGivenElement != null) yield return NotGivenElement; - foreach (var elem in ReasonNotGiven) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (Prescription != null) yield return Prescription; - foreach (var elem in Device) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - if (Dosage != null) yield return Dosage; - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (Effective != null) yield return new ElementValue("effective", Effective); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (NotGivenElement != null) yield return new ElementValue("notGiven", NotGivenElement); - foreach (var elem in ReasonNotGiven) { if (elem != null) yield return new ElementValue("reasonNotGiven", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (Prescription != null) yield return new ElementValue("prescription", Prescription); - foreach (var elem in Device) { if (elem != null) yield return new ElementValue("device", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - if (Dosage != null) yield return new ElementValue("dosage", Dosage); - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1103,7 +993,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1173,7 +1063,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs index 2fa3324a81..f30ae7564c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationDispense.cs @@ -199,29 +199,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Actor != null) yield return Actor; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Actor != null) yield return new ElementValue("actor", Actor); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -237,7 +215,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -253,7 +231,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Actor is not null) yield return new KeyValuePair("actor",Actor); @@ -406,33 +384,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (WasSubstitutedElement != null) yield return WasSubstitutedElement; - if (Type != null) yield return Type; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in ResponsibleParty) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (WasSubstitutedElement != null) yield return new ElementValue("wasSubstituted", WasSubstitutedElement); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in ResponsibleParty) { if (elem != null) yield return new ElementValue("responsibleParty", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -454,7 +406,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -476,7 +428,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (WasSubstitutedElement is not null) yield return new KeyValuePair("wasSubstituted",WasSubstitutedElement); @@ -1024,73 +976,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Category != null) yield return Category; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - foreach (var elem in Performer) { if (elem != null) yield return elem; } - foreach (var elem in AuthorizingPrescription) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (Quantity != null) yield return Quantity; - if (DaysSupply != null) yield return DaysSupply; - if (WhenPreparedElement != null) yield return WhenPreparedElement; - if (WhenHandedOverElement != null) yield return WhenHandedOverElement; - if (Destination != null) yield return Destination; - foreach (var elem in Receiver) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in DosageInstruction) { if (elem != null) yield return elem; } - if (Substitution != null) yield return Substitution; - foreach (var elem in DetectedIssue) { if (elem != null) yield return elem; } - if (NotDoneElement != null) yield return NotDoneElement; - if (NotDoneReason != null) yield return NotDoneReason; - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - foreach (var elem in AuthorizingPrescription) { if (elem != null) yield return new ElementValue("authorizingPrescription", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (DaysSupply != null) yield return new ElementValue("daysSupply", DaysSupply); - if (WhenPreparedElement != null) yield return new ElementValue("whenPrepared", WhenPreparedElement); - if (WhenHandedOverElement != null) yield return new ElementValue("whenHandedOver", WhenHandedOverElement); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Receiver) { if (elem != null) yield return new ElementValue("receiver", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in DosageInstruction) { if (elem != null) yield return new ElementValue("dosageInstruction", elem); } - if (Substitution != null) yield return new ElementValue("substitution", Substitution); - foreach (var elem in DetectedIssue) { if (elem != null) yield return new ElementValue("detectedIssue", elem); } - if (NotDoneElement != null) yield return new ElementValue("notDone", NotDoneElement); - if (NotDoneReason != null) yield return new ElementValue("notDoneReason", NotDoneReason); - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1172,7 +1058,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1254,7 +1140,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs index 72c4fd9b1a..6c5e17bfd4 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationRequest.cs @@ -277,29 +277,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Agent != null) yield return Agent; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Agent != null) yield return new ElementValue("agent", Agent); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -315,7 +293,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -331,7 +309,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Agent is not null) yield return new KeyValuePair("agent",Agent); @@ -495,35 +473,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ValidityPeriod != null) yield return ValidityPeriod; - if (NumberOfRepeatsAllowedElement != null) yield return NumberOfRepeatsAllowedElement; - if (Quantity != null) yield return Quantity; - if (ExpectedSupplyDuration != null) yield return ExpectedSupplyDuration; - if (Performer != null) yield return Performer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ValidityPeriod != null) yield return new ElementValue("validityPeriod", ValidityPeriod); - if (NumberOfRepeatsAllowedElement != null) yield return new ElementValue("numberOfRepeatsAllowed", NumberOfRepeatsAllowedElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (ExpectedSupplyDuration != null) yield return new ElementValue("expectedSupplyDuration", ExpectedSupplyDuration); - if (Performer != null) yield return new ElementValue("performer", Performer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -548,7 +498,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -573,7 +523,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ValidityPeriod is not null) yield return new KeyValuePair("validityPeriod",ValidityPeriod); @@ -692,29 +642,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AllowedElement != null) yield return AllowedElement; - if (Reason != null) yield return Reason; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AllowedElement != null) yield return new ElementValue("allowed", AllowedElement); - if (Reason != null) yield return new ElementValue("reason", Reason); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -730,7 +658,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -746,7 +674,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AllowedElement is not null) yield return new KeyValuePair("allowed",AllowedElement); @@ -1297,73 +1225,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (Category != null) yield return Category; - if (PriorityElement != null) yield return PriorityElement; - if (Medication != null) yield return Medication; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - foreach (var elem in SupportingInformation) { if (elem != null) yield return elem; } - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (Recorder != null) yield return Recorder; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in DosageInstruction) { if (elem != null) yield return elem; } - if (DispenseRequest != null) yield return DispenseRequest; - if (Substitution != null) yield return Substitution; - if (PriorPrescription != null) yield return PriorPrescription; - foreach (var elem in DetectedIssue) { if (elem != null) yield return elem; } - foreach (var elem in EventHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (Category != null) yield return new ElementValue("category", Category); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - foreach (var elem in SupportingInformation) { if (elem != null) yield return new ElementValue("supportingInformation", elem); } - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (Recorder != null) yield return new ElementValue("recorder", Recorder); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in DosageInstruction) { if (elem != null) yield return new ElementValue("dosageInstruction", elem); } - if (DispenseRequest != null) yield return new ElementValue("dispenseRequest", DispenseRequest); - if (Substitution != null) yield return new ElementValue("substitution", Substitution); - if (PriorPrescription != null) yield return new ElementValue("priorPrescription", PriorPrescription); - foreach (var elem in DetectedIssue) { if (elem != null) yield return new ElementValue("detectedIssue", elem); } - foreach (var elem in EventHistory) { if (elem != null) yield return new ElementValue("eventHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1445,7 +1307,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1527,7 +1389,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs b/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs index c5727f5cab..2b6d95c91c 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MedicationStatement.cs @@ -573,61 +573,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (Context != null) yield return Context; - if (StatusElement != null) yield return StatusElement; - if (Category != null) yield return Category; - if (Medication != null) yield return Medication; - if (Effective != null) yield return Effective; - if (DateAssertedElement != null) yield return DateAssertedElement; - if (InformationSource != null) yield return InformationSource; - if (Subject != null) yield return Subject; - foreach (var elem in DerivedFrom) { if (elem != null) yield return elem; } - if (TakenElement != null) yield return TakenElement; - foreach (var elem in ReasonNotTaken) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Dosage) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (Context != null) yield return new ElementValue("context", Context); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Category != null) yield return new ElementValue("category", Category); - if (Medication != null) yield return new ElementValue("medication", Medication); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (DateAssertedElement != null) yield return new ElementValue("dateAsserted", DateAssertedElement); - if (InformationSource != null) yield return new ElementValue("informationSource", InformationSource); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in DerivedFrom) { if (elem != null) yield return new ElementValue("derivedFrom", elem); } - if (TakenElement != null) yield return new ElementValue("taken", TakenElement); - foreach (var elem in ReasonNotTaken) { if (elem != null) yield return new ElementValue("reasonNotTaken", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Dosage) { if (elem != null) yield return new ElementValue("dosage", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -691,7 +637,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -755,7 +701,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs index 66cc816708..53217d3f1e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MessageDefinition.cs @@ -238,33 +238,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (Profile != null) yield return Profile; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -286,7 +260,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -308,7 +282,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -428,29 +402,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Message != null) yield return Message; - if (SituationElement != null) yield return SituationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Message != null) yield return new ElementValue("message", Message); - if (SituationElement != null) yield return new ElementValue("situation", SituationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -466,7 +418,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -482,7 +434,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Message is not null) yield return new KeyValuePair("message",Message); @@ -1156,71 +1108,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (Base != null) yield return Base; - foreach (var elem in Parent) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (Event != null) yield return Event; - if (CategoryElement != null) yield return CategoryElement; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - if (ResponseRequiredElement != null) yield return ResponseRequiredElement; - foreach (var elem in AllowedResponse) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (Base != null) yield return new ElementValue("base", Base); - foreach (var elem in Parent) { if (elem != null) yield return new ElementValue("parent", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (Event != null) yield return new ElementValue("event", Event); - if (CategoryElement != null) yield return new ElementValue("category", CategoryElement); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - if (ResponseRequiredElement != null) yield return new ElementValue("responseRequired", ResponseRequiredElement); - foreach (var elem in AllowedResponse) { if (elem != null) yield return new ElementValue("allowedResponse", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1299,7 +1187,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1378,7 +1266,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs b/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs index 43ae423c7e..6dcb45fa89 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/MessageHeader.cs @@ -230,31 +230,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Target != null) yield return Target; - if (EndpointElement != null) yield return EndpointElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Target != null) yield return new ElementValue("target", Target); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -273,7 +249,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -292,7 +268,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -510,35 +486,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (SoftwareElement != null) yield return SoftwareElement; - if (VersionElement != null) yield return VersionElement; - if (Contact != null) yield return Contact; - if (EndpointElement != null) yield return EndpointElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (SoftwareElement != null) yield return new ElementValue("software", SoftwareElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (Contact != null) yield return new ElementValue("contact", Contact); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -563,7 +511,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -588,7 +536,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -745,31 +693,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentifierElement != null) yield return IdentifierElement; - if (CodeElement != null) yield return CodeElement; - if (Details != null) yield return Details; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentifierElement != null) yield return new ElementValue("identifier", IdentifierElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (Details != null) yield return new ElementValue("details", Details); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -788,7 +712,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -807,7 +731,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentifierElement is not null) yield return new KeyValuePair("identifier",IdentifierElement); @@ -1085,49 +1009,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Event != null) yield return Event; - foreach (var elem in Destination) { if (elem != null) yield return elem; } - if (Receiver != null) yield return Receiver; - if (Sender != null) yield return Sender; - if (TimestampElement != null) yield return TimestampElement; - if (Enterer != null) yield return Enterer; - if (Author != null) yield return Author; - if (Source != null) yield return Source; - if (Responsible != null) yield return Responsible; - if (Reason != null) yield return Reason; - if (Response != null) yield return Response; - foreach (var elem in Focus) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Event != null) yield return new ElementValue("event", Event); - foreach (var elem in Destination) { if (elem != null) yield return new ElementValue("destination", elem); } - if (Receiver != null) yield return new ElementValue("receiver", Receiver); - if (Sender != null) yield return new ElementValue("sender", Sender); - if (TimestampElement != null) yield return new ElementValue("timestamp", TimestampElement); - if (Enterer != null) yield return new ElementValue("enterer", Enterer); - if (Author != null) yield return new ElementValue("author", Author); - if (Source != null) yield return new ElementValue("source", Source); - if (Responsible != null) yield return new ElementValue("responsible", Responsible); - if (Reason != null) yield return new ElementValue("reason", Reason); - if (Response != null) yield return new ElementValue("response", Response); - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1173,7 +1055,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1219,7 +1101,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Event is not null) yield return new KeyValuePair("event",Event); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs b/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs index 398e271d22..019a0e200a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/NamingSystem.cs @@ -333,35 +333,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (ValueElement != null) yield return ValueElement; - if (PreferredElement != null) yield return PreferredElement; - if (CommentElement != null) yield return CommentElement; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -386,7 +358,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -411,7 +383,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -846,53 +818,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (KindElement != null) yield return KindElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (ResponsibleElement != null) yield return ResponsibleElement; - if (Type != null) yield return Type; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (UsageElement != null) yield return UsageElement; - foreach (var elem in UniqueId) { if (elem != null) yield return elem; } - if (ReplacedBy != null) yield return ReplacedBy; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (ResponsibleElement != null) yield return new ElementValue("responsible", ResponsibleElement); - if (Type != null) yield return new ElementValue("type", Type); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - foreach (var elem in UniqueId) { if (elem != null) yield return new ElementValue("uniqueId", elem); } - if (ReplacedBy != null) yield return new ElementValue("replacedBy", ReplacedBy); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -944,7 +870,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -996,7 +922,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs b/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs index e3d78db401..1fa6219bc1 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/NutritionOrder.cs @@ -300,37 +300,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Type) { if (elem != null) yield return elem; } - foreach (var elem in Schedule) { if (elem != null) yield return elem; } - foreach (var elem in Nutrient) { if (elem != null) yield return elem; } - foreach (var elem in Texture) { if (elem != null) yield return elem; } - foreach (var elem in FluidConsistencyType) { if (elem != null) yield return elem; } - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - foreach (var elem in Schedule) { if (elem != null) yield return new ElementValue("schedule", elem); } - foreach (var elem in Nutrient) { if (elem != null) yield return new ElementValue("nutrient", elem); } - foreach (var elem in Texture) { if (elem != null) yield return new ElementValue("texture", elem); } - foreach (var elem in FluidConsistencyType) { if (elem != null) yield return new ElementValue("fluidConsistencyType", elem); } - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -358,7 +328,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -386,7 +356,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type?.Any() == true) yield return new KeyValuePair("type",Type); @@ -487,29 +457,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Modifier != null) yield return Modifier; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Modifier != null) yield return new ElementValue("modifier", Modifier); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -525,7 +473,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -541,7 +489,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Modifier is not null) yield return new KeyValuePair("modifier",Modifier); @@ -639,29 +587,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Modifier != null) yield return Modifier; - if (FoodType != null) yield return FoodType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Modifier != null) yield return new ElementValue("modifier", Modifier); - if (FoodType != null) yield return new ElementValue("foodType", FoodType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -677,7 +603,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -693,7 +619,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Modifier is not null) yield return new KeyValuePair("modifier",Modifier); @@ -875,35 +801,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ProductNameElement != null) yield return ProductNameElement; - foreach (var elem in Schedule) { if (elem != null) yield return elem; } - if (Quantity != null) yield return Quantity; - if (InstructionElement != null) yield return InstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ProductNameElement != null) yield return new ElementValue("productName", ProductNameElement); - foreach (var elem in Schedule) { if (elem != null) yield return new ElementValue("schedule", elem); } - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (InstructionElement != null) yield return new ElementValue("instruction", InstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -928,7 +826,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -953,7 +851,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1222,43 +1120,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (BaseFormulaType != null) yield return BaseFormulaType; - if (BaseFormulaProductNameElement != null) yield return BaseFormulaProductNameElement; - if (AdditiveType != null) yield return AdditiveType; - if (AdditiveProductNameElement != null) yield return AdditiveProductNameElement; - if (CaloricDensity != null) yield return CaloricDensity; - if (RouteofAdministration != null) yield return RouteofAdministration; - foreach (var elem in Administration) { if (elem != null) yield return elem; } - if (MaxVolumeToDeliver != null) yield return MaxVolumeToDeliver; - if (AdministrationInstructionElement != null) yield return AdministrationInstructionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (BaseFormulaType != null) yield return new ElementValue("baseFormulaType", BaseFormulaType); - if (BaseFormulaProductNameElement != null) yield return new ElementValue("baseFormulaProductName", BaseFormulaProductNameElement); - if (AdditiveType != null) yield return new ElementValue("additiveType", AdditiveType); - if (AdditiveProductNameElement != null) yield return new ElementValue("additiveProductName", AdditiveProductNameElement); - if (CaloricDensity != null) yield return new ElementValue("caloricDensity", CaloricDensity); - if (RouteofAdministration != null) yield return new ElementValue("routeofAdministration", RouteofAdministration); - foreach (var elem in Administration) { if (elem != null) yield return new ElementValue("administration", elem); } - if (MaxVolumeToDeliver != null) yield return new ElementValue("maxVolumeToDeliver", MaxVolumeToDeliver); - if (AdministrationInstructionElement != null) yield return new ElementValue("administrationInstruction", AdministrationInstructionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1295,7 +1157,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1332,7 +1194,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (BaseFormulaType is not null) yield return new KeyValuePair("baseFormulaType",BaseFormulaType); @@ -1454,31 +1316,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Schedule != null) yield return Schedule; - if (Quantity != null) yield return Quantity; - if (Rate != null) yield return Rate; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Rate != null) yield return new ElementValue("rate", Rate); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1497,7 +1335,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1516,7 +1354,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Schedule is not null) yield return new KeyValuePair("schedule",Schedule); @@ -1814,49 +1652,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (DateTimeElement != null) yield return DateTimeElement; - if (Orderer != null) yield return Orderer; - foreach (var elem in AllergyIntolerance) { if (elem != null) yield return elem; } - foreach (var elem in FoodPreferenceModifier) { if (elem != null) yield return elem; } - foreach (var elem in ExcludeFoodModifier) { if (elem != null) yield return elem; } - if (OralDiet != null) yield return OralDiet; - foreach (var elem in Supplement) { if (elem != null) yield return elem; } - if (EnteralFormula != null) yield return EnteralFormula; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateTimeElement != null) yield return new ElementValue("dateTime", DateTimeElement); - if (Orderer != null) yield return new ElementValue("orderer", Orderer); - foreach (var elem in AllergyIntolerance) { if (elem != null) yield return new ElementValue("allergyIntolerance", elem); } - foreach (var elem in FoodPreferenceModifier) { if (elem != null) yield return new ElementValue("foodPreferenceModifier", elem); } - foreach (var elem in ExcludeFoodModifier) { if (elem != null) yield return new ElementValue("excludeFoodModifier", elem); } - if (OralDiet != null) yield return new ElementValue("oralDiet", OralDiet); - foreach (var elem in Supplement) { if (elem != null) yield return new ElementValue("supplement", elem); } - if (EnteralFormula != null) yield return new ElementValue("enteralFormula", EnteralFormula); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1902,7 +1698,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1948,7 +1744,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs b/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs index 185cd5186b..9fe9f7f131 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Observation.cs @@ -279,37 +279,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Low != null) yield return Low; - if (High != null) yield return High; - if (Type != null) yield return Type; - foreach (var elem in AppliesTo) { if (elem != null) yield return elem; } - if (Age != null) yield return Age; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Low != null) yield return new ElementValue("low", Low); - if (High != null) yield return new ElementValue("high", High); - if (Type != null) yield return new ElementValue("type", Type); - foreach (var elem in AppliesTo) { if (elem != null) yield return new ElementValue("appliesTo", elem); } - if (Age != null) yield return new ElementValue("age", Age); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -337,7 +307,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -365,7 +335,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Low is not null) yield return new KeyValuePair("low",Low); @@ -489,29 +459,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Target != null) yield return Target; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Target != null) yield return new ElementValue("target", Target); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -527,7 +475,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -543,7 +491,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -695,35 +643,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Code != null) yield return Code; - if (Value != null) yield return Value; - if (DataAbsentReason != null) yield return DataAbsentReason; - if (Interpretation != null) yield return Interpretation; - foreach (var elem in ReferenceRange) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Code != null) yield return new ElementValue("code", Code); - if (Value != null) yield return new ElementValue("value", Value); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - if (Interpretation != null) yield return new ElementValue("interpretation", Interpretation); - foreach (var elem in ReferenceRange) { if (elem != null) yield return new ElementValue("referenceRange", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -748,7 +668,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -773,7 +693,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Code is not null) yield return new KeyValuePair("code",Code); @@ -1249,67 +1169,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Effective != null) yield return Effective; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Value != null) yield return Value; - if (DataAbsentReason != null) yield return DataAbsentReason; - if (Interpretation != null) yield return Interpretation; - if (CommentElement != null) yield return CommentElement; - if (BodySite != null) yield return BodySite; - if (Method != null) yield return Method; - if (Specimen != null) yield return Specimen; - if (Device != null) yield return Device; - foreach (var elem in ReferenceRange) { if (elem != null) yield return elem; } - foreach (var elem in Related) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Effective != null) yield return new ElementValue("effective", Effective); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Value != null) yield return new ElementValue("value", Value); - if (DataAbsentReason != null) yield return new ElementValue("dataAbsentReason", DataAbsentReason); - if (Interpretation != null) yield return new ElementValue("interpretation", Interpretation); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - if (Method != null) yield return new ElementValue("method", Method); - if (Specimen != null) yield return new ElementValue("specimen", Specimen); - if (Device != null) yield return new ElementValue("device", Device); - foreach (var elem in ReferenceRange) { if (elem != null) yield return new ElementValue("referenceRange", elem); } - foreach (var elem in Related) { if (elem != null) yield return new ElementValue("related", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1382,7 +1242,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1455,7 +1315,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs index 9db7c6b0f3..2b8c8a567a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/OperationDefinition.cs @@ -436,45 +436,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (UseElement != null) yield return UseElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (TypeElement != null) yield return TypeElement; - if (SearchTypeElement != null) yield return SearchTypeElement; - if (Profile != null) yield return Profile; - if (Binding != null) yield return Binding; - foreach (var elem in Part) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (SearchTypeElement != null) yield return new ElementValue("searchType", SearchTypeElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - if (Binding != null) yield return new ElementValue("binding", Binding); - foreach (var elem in Part) { if (elem != null) yield return new ElementValue("part", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -514,7 +476,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -554,7 +516,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -683,29 +645,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StrengthElement != null) yield return StrengthElement; - if (ValueSet != null) yield return ValueSet; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StrengthElement != null) yield return new ElementValue("strength", StrengthElement); - if (ValueSet != null) yield return new ElementValue("valueSet", ValueSet); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -721,7 +661,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -737,7 +677,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StrengthElement is not null) yield return new KeyValuePair("strength",StrengthElement); @@ -871,29 +811,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in ParameterNameElement) { if (elem != null) yield return elem; } - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in ParameterNameElement) { if (elem != null) yield return new ElementValue("parameterName", elem); } - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -909,7 +827,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -925,7 +843,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ParameterNameElement?.Any() == true) yield return new KeyValuePair("parameterName",ParameterNameElement); @@ -1669,71 +1587,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (KindElement != null) yield return KindElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (IdempotentElement != null) yield return IdempotentElement; - if (CodeElement != null) yield return CodeElement; - if (CommentElement != null) yield return CommentElement; - if (Base != null) yield return Base; - foreach (var elem in ResourceElement) { if (elem != null) yield return elem; } - if (SystemElement != null) yield return SystemElement; - if (TypeElement != null) yield return TypeElement; - if (InstanceElement != null) yield return InstanceElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in Overload) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (IdempotentElement != null) yield return new ElementValue("idempotent", IdempotentElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - if (Base != null) yield return new ElementValue("base", Base); - foreach (var elem in ResourceElement) { if (elem != null) yield return new ElementValue("resource", elem); } - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (InstanceElement != null) yield return new ElementValue("instance", InstanceElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in Overload) { if (elem != null) yield return new ElementValue("overload", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1812,7 +1666,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1891,7 +1745,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs b/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs index 6874f08bf4..769aa42017 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Organization.cs @@ -180,33 +180,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Purpose != null) yield return Purpose; - if (Name != null) yield return Name; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Purpose != null) yield return new ElementValue("purpose", Purpose); - if (Name != null) yield return new ElementValue("name", Name); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -228,7 +202,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -250,7 +224,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Purpose is not null) yield return new KeyValuePair("purpose",Purpose); @@ -528,45 +502,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Type) { if (elem != null) yield return elem; } - if (NameElement != null) yield return NameElement; - foreach (var elem in AliasElement) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (PartOf != null) yield return PartOf; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Type) { if (elem != null) yield return new ElementValue("type", elem); } - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in AliasElement) { if (elem != null) yield return new ElementValue("alias", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (PartOf != null) yield return new ElementValue("partOf", PartOf); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -606,7 +542,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -646,7 +582,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ParameterDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ParameterDefinition.cs index 0bfe791054..9c128ed6f5 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ParameterDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ParameterDefinition.cs @@ -326,39 +326,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (UseElement != null) yield return UseElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (DocumentationElement != null) yield return DocumentationElement; - if (TypeElement != null) yield return TypeElement; - if (Profile != null) yield return Profile; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (UseElement != null) yield return new ElementValue("use", UseElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -389,7 +357,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -420,7 +388,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs b/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs index 9a4233879f..8187fc7f6d 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Patient.cs @@ -285,39 +285,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Relationship) { if (elem != null) yield return elem; } - if (Name != null) yield return Name; - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (Address != null) yield return Address; - if (GenderElement != null) yield return GenderElement; - if (Organization != null) yield return Organization; - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Relationship) { if (elem != null) yield return new ElementValue("relationship", elem); } - if (Name != null) yield return new ElementValue("name", Name); - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (Address != null) yield return new ElementValue("address", Address); - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -348,7 +316,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -379,7 +347,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Relationship?.Any() == true) yield return new KeyValuePair("relationship",Relationship); @@ -501,31 +469,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Species != null) yield return Species; - if (Breed != null) yield return Breed; - if (GenderStatus != null) yield return GenderStatus; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Species != null) yield return new ElementValue("species", Species); - if (Breed != null) yield return new ElementValue("breed", Breed); - if (GenderStatus != null) yield return new ElementValue("genderStatus", GenderStatus); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -544,7 +488,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -563,7 +507,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Species is not null) yield return new KeyValuePair("species",Species); @@ -681,29 +625,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Language != null) yield return Language; - if (PreferredElement != null) yield return PreferredElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Language != null) yield return new ElementValue("language", Language); - if (PreferredElement != null) yield return new ElementValue("preferred", PreferredElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -719,7 +641,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -735,7 +657,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Language is not null) yield return new KeyValuePair("language",Language); @@ -857,29 +779,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Other != null) yield return Other; - if (TypeElement != null) yield return TypeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Other != null) yield return new ElementValue("other", Other); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -895,7 +795,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -911,7 +811,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Other is not null) yield return new KeyValuePair("other",Other); @@ -1307,59 +1207,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - if (Deceased != null) yield return Deceased; - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (MaritalStatus != null) yield return MaritalStatus; - if (MultipleBirth != null) yield return MultipleBirth; - foreach (var elem in Photo) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (Animal != null) yield return Animal; - foreach (var elem in Communication) { if (elem != null) yield return elem; } - foreach (var elem in GeneralPractitioner) { if (elem != null) yield return elem; } - if (ManagingOrganization != null) yield return ManagingOrganization; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - if (Deceased != null) yield return new ElementValue("deceased", Deceased); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (MaritalStatus != null) yield return new ElementValue("maritalStatus", MaritalStatus); - if (MultipleBirth != null) yield return new ElementValue("multipleBirth", MultipleBirth); - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (Animal != null) yield return new ElementValue("animal", Animal); - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - foreach (var elem in GeneralPractitioner) { if (elem != null) yield return new ElementValue("generalPractitioner", elem); } - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1420,7 +1268,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1481,7 +1329,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs b/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs index 0ad8e324e8..04e3876267 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/PaymentNotice.cs @@ -328,45 +328,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - if (StatusDateElement != null) yield return StatusDateElement; - if (CreatedElement != null) yield return CreatedElement; - if (Target != null) yield return Target; - if (Provider != null) yield return Provider; - if (Organization != null) yield return Organization; - if (PaymentStatus != null) yield return PaymentStatus; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - if (StatusDateElement != null) yield return new ElementValue("statusDate", StatusDateElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Target != null) yield return new ElementValue("target", Target); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (PaymentStatus != null) yield return new ElementValue("paymentStatus", PaymentStatus); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -406,7 +368,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -446,7 +408,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs b/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs index 385f15c0fb..58de5b16bb 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/PaymentReconciliation.cs @@ -254,39 +254,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - if (Submitter != null) yield return Submitter; - if (Payee != null) yield return Payee; - if (DateElement != null) yield return DateElement; - if (Amount != null) yield return Amount; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - if (Submitter != null) yield return new ElementValue("submitter", Submitter); - if (Payee != null) yield return new ElementValue("payee", Payee); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (Amount != null) yield return new ElementValue("amount", Amount); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -317,7 +285,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -348,7 +316,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -468,29 +436,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -506,7 +452,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -522,7 +468,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -865,53 +811,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - if (CreatedElement != null) yield return CreatedElement; - if (Organization != null) yield return Organization; - if (Request != null) yield return Request; - if (Outcome != null) yield return Outcome; - if (DispositionElement != null) yield return DispositionElement; - if (RequestProvider != null) yield return RequestProvider; - if (RequestOrganization != null) yield return RequestOrganization; - foreach (var elem in Detail) { if (elem != null) yield return elem; } - if (Form != null) yield return Form; - if (Total != null) yield return Total; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Request != null) yield return new ElementValue("request", Request); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (RequestProvider != null) yield return new ElementValue("requestProvider", RequestProvider); - if (RequestOrganization != null) yield return new ElementValue("requestOrganization", RequestOrganization); - foreach (var elem in Detail) { if (elem != null) yield return new ElementValue("detail", elem); } - if (Form != null) yield return new ElementValue("form", Form); - if (Total != null) yield return new ElementValue("total", Total); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -963,7 +863,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1015,7 +915,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Person.cs b/src/Hl7.Fhir.STU3/Model/Generated/Person.cs index e14a782e54..9133c1db23 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Person.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Person.cs @@ -201,29 +201,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Target != null) yield return Target; - if (AssuranceElement != null) yield return AssuranceElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Target != null) yield return new ElementValue("target", Target); - if (AssuranceElement != null) yield return new ElementValue("assurance", AssuranceElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -239,7 +217,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -255,7 +233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target is not null) yield return new KeyValuePair("target",Target); @@ -528,45 +506,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (Photo != null) yield return Photo; - if (ManagingOrganization != null) yield return ManagingOrganization; - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Link) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (Photo != null) yield return new ElementValue("photo", Photo); - if (ManagingOrganization != null) yield return new ElementValue("managingOrganization", ManagingOrganization); - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -606,7 +546,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -646,7 +586,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs index 0fec26c656..8701dd3dc3 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/PlanDefinition.cs @@ -235,39 +235,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Category != null) yield return Category; - if (Description != null) yield return Description; - if (Priority != null) yield return Priority; - if (Start != null) yield return Start; - foreach (var elem in Addresses) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Category != null) yield return new ElementValue("category", Category); - if (Description != null) yield return new ElementValue("description", Description); - if (Priority != null) yield return new ElementValue("priority", Priority); - if (Start != null) yield return new ElementValue("start", Start); - foreach (var elem in Addresses) { if (elem != null) yield return new ElementValue("addresses", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -298,7 +266,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -329,7 +297,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Category is not null) yield return new KeyValuePair("category",Category); @@ -449,31 +417,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Measure != null) yield return Measure; - if (Detail != null) yield return Detail; - if (Due != null) yield return Due; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Measure != null) yield return new ElementValue("measure", Measure); - if (Detail != null) yield return new ElementValue("detail", Detail); - if (Due != null) yield return new ElementValue("due", Due); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -492,7 +436,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -511,7 +455,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Measure is not null) yield return new KeyValuePair("measure",Measure); @@ -1185,75 +1129,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LabelElement != null) yield return LabelElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TextEquivalentElement != null) yield return TextEquivalentElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Reason) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in GoalIdElement) { if (elem != null) yield return elem; } - foreach (var elem in TriggerDefinition) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - foreach (var elem in RelatedAction) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (GroupingBehaviorElement != null) yield return GroupingBehaviorElement; - if (SelectionBehaviorElement != null) yield return SelectionBehaviorElement; - if (RequiredBehaviorElement != null) yield return RequiredBehaviorElement; - if (PrecheckBehaviorElement != null) yield return PrecheckBehaviorElement; - if (CardinalityBehaviorElement != null) yield return CardinalityBehaviorElement; - if (Definition != null) yield return Definition; - if (Transform != null) yield return Transform; - foreach (var elem in DynamicValue) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TextEquivalentElement != null) yield return new ElementValue("textEquivalent", TextEquivalentElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in GoalIdElement) { if (elem != null) yield return new ElementValue("goalId", elem); } - foreach (var elem in TriggerDefinition) { if (elem != null) yield return new ElementValue("triggerDefinition", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - foreach (var elem in RelatedAction) { if (elem != null) yield return new ElementValue("relatedAction", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (GroupingBehaviorElement != null) yield return new ElementValue("groupingBehavior", GroupingBehaviorElement); - if (SelectionBehaviorElement != null) yield return new ElementValue("selectionBehavior", SelectionBehaviorElement); - if (RequiredBehaviorElement != null) yield return new ElementValue("requiredBehavior", RequiredBehaviorElement); - if (PrecheckBehaviorElement != null) yield return new ElementValue("precheckBehavior", PrecheckBehaviorElement); - if (CardinalityBehaviorElement != null) yield return new ElementValue("cardinalityBehavior", CardinalityBehaviorElement); - if (Definition != null) yield return new ElementValue("definition", Definition); - if (Transform != null) yield return new ElementValue("transform", Transform); - foreach (var elem in DynamicValue) { if (elem != null) yield return new ElementValue("dynamicValue", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1338,7 +1214,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1423,7 +1299,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LabelElement is not null) yield return new KeyValuePair("label",LabelElement); @@ -1649,33 +1525,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (LanguageElement != null) yield return LanguageElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1697,7 +1547,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1719,7 +1569,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -1876,31 +1726,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActionIdElement != null) yield return ActionIdElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (Offset != null) yield return Offset; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActionIdElement != null) yield return new ElementValue("actionId", ActionIdElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (Offset != null) yield return new ElementValue("offset", Offset); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1919,7 +1745,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1938,7 +1764,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActionIdElement is not null) yield return new KeyValuePair("actionId",ActionIdElement); @@ -2057,29 +1883,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (Role != null) yield return Role; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (Role != null) yield return new ElementValue("role", Role); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2095,7 +1899,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2111,7 +1915,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2311,33 +2115,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (PathElement != null) yield return PathElement; - if (LanguageElement != null) yield return LanguageElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2359,7 +2137,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2381,7 +2159,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -3119,77 +2897,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (Type != null) yield return Type; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Library) { if (elem != null) yield return elem; } - foreach (var elem in Goal) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (Type != null) yield return new ElementValue("type", Type); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Library) { if (elem != null) yield return new ElementValue("library", elem); } - foreach (var elem in Goal) { if (elem != null) yield return new ElementValue("goal", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3277,7 +2985,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3365,7 +3073,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs b/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs index 18ad5c4fe7..342353d6f0 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Practitioner.cs @@ -181,33 +181,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Period != null) yield return Period; - if (Issuer != null) yield return Issuer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Period != null) yield return new ElementValue("period", Period); - if (Issuer != null) yield return new ElementValue("issuer", Issuer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -229,7 +203,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -251,7 +225,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -527,45 +501,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in Address) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Photo) { if (elem != null) yield return elem; } - foreach (var elem in Qualification) { if (elem != null) yield return elem; } - foreach (var elem in Communication) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - foreach (var elem in Qualification) { if (elem != null) yield return new ElementValue("qualification", elem); } - foreach (var elem in Communication) { if (elem != null) yield return new ElementValue("communication", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -605,7 +541,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -645,7 +581,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs b/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs index d52cb205c6..56d5361d29 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/PractitionerRole.cs @@ -254,33 +254,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return elem; } - if (AllDayElement != null) yield return AllDayElement; - if (AvailableStartTimeElement != null) yield return AvailableStartTimeElement; - if (AvailableEndTimeElement != null) yield return AvailableEndTimeElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in DaysOfWeekElement) { if (elem != null) yield return new ElementValue("daysOfWeek", elem); } - if (AllDayElement != null) yield return new ElementValue("allDay", AllDayElement); - if (AvailableStartTimeElement != null) yield return new ElementValue("availableStartTime", AvailableStartTimeElement); - if (AvailableEndTimeElement != null) yield return new ElementValue("availableEndTime", AvailableEndTimeElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -302,7 +276,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -324,7 +298,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DaysOfWeekElement?.Any() == true) yield return new KeyValuePair("daysOfWeek",DaysOfWeekElement); @@ -441,29 +415,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (During != null) yield return During; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (During != null) yield return new ElementValue("during", During); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -479,7 +431,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -495,7 +447,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -826,53 +778,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Period != null) yield return Period; - if (Practitioner != null) yield return Practitioner; - if (Organization != null) yield return Organization; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Location) { if (elem != null) yield return elem; } - foreach (var elem in HealthcareService) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - foreach (var elem in AvailableTime) { if (elem != null) yield return elem; } - foreach (var elem in NotAvailable) { if (elem != null) yield return elem; } - if (AvailabilityExceptionsElement != null) yield return AvailabilityExceptionsElement; - foreach (var elem in Endpoint) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Practitioner != null) yield return new ElementValue("practitioner", Practitioner); - if (Organization != null) yield return new ElementValue("organization", Organization); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Location) { if (elem != null) yield return new ElementValue("location", elem); } - foreach (var elem in HealthcareService) { if (elem != null) yield return new ElementValue("healthcareService", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - foreach (var elem in AvailableTime) { if (elem != null) yield return new ElementValue("availableTime", elem); } - foreach (var elem in NotAvailable) { if (elem != null) yield return new ElementValue("notAvailable", elem); } - if (AvailabilityExceptionsElement != null) yield return new ElementValue("availabilityExceptions", AvailabilityExceptionsElement); - foreach (var elem in Endpoint) { if (elem != null) yield return new ElementValue("endpoint", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -924,7 +830,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -976,7 +882,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs b/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs index 3153141786..415cd81e4a 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Procedure.cs @@ -168,31 +168,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Role != null) yield return Role; - if (Actor != null) yield return Actor; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Role != null) yield return new ElementValue("role", Role); - if (Actor != null) yield return new ElementValue("actor", Actor); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -211,7 +187,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -230,7 +206,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role is not null) yield return new KeyValuePair("role",Role); @@ -331,29 +307,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Action != null) yield return Action; - if (Manipulated != null) yield return Manipulated; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Action != null) yield return new ElementValue("action", Action); - if (Manipulated != null) yield return new ElementValue("manipulated", Manipulated); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +323,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -385,7 +339,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action is not null) yield return new KeyValuePair("action",Action); @@ -938,77 +892,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (NotDoneElement != null) yield return NotDoneElement; - if (NotDoneReason != null) yield return NotDoneReason; - if (Category != null) yield return Category; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Performed != null) yield return Performed; - foreach (var elem in Performer) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - if (Outcome != null) yield return Outcome; - foreach (var elem in Report) { if (elem != null) yield return elem; } - foreach (var elem in Complication) { if (elem != null) yield return elem; } - foreach (var elem in ComplicationDetail) { if (elem != null) yield return elem; } - foreach (var elem in FollowUp) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in FocalDevice) { if (elem != null) yield return elem; } - foreach (var elem in UsedReference) { if (elem != null) yield return elem; } - foreach (var elem in UsedCode) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (NotDoneElement != null) yield return new ElementValue("notDone", NotDoneElement); - if (NotDoneReason != null) yield return new ElementValue("notDoneReason", NotDoneReason); - if (Category != null) yield return new ElementValue("category", Category); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Performed != null) yield return new ElementValue("performed", Performed); - foreach (var elem in Performer) { if (elem != null) yield return new ElementValue("performer", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - foreach (var elem in Report) { if (elem != null) yield return new ElementValue("report", elem); } - foreach (var elem in Complication) { if (elem != null) yield return new ElementValue("complication", elem); } - foreach (var elem in ComplicationDetail) { if (elem != null) yield return new ElementValue("complicationDetail", elem); } - foreach (var elem in FollowUp) { if (elem != null) yield return new ElementValue("followUp", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in FocalDevice) { if (elem != null) yield return new ElementValue("focalDevice", elem); } - foreach (var elem in UsedReference) { if (elem != null) yield return new ElementValue("usedReference", elem); } - foreach (var elem in UsedCode) { if (elem != null) yield return new ElementValue("usedCode", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1096,7 +980,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1184,7 +1068,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs index df3a51bc57..84dbebb669 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcedureRequest.cs @@ -152,29 +152,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Agent != null) yield return Agent; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Agent != null) yield return new ElementValue("agent", Agent); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -190,7 +168,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -206,7 +184,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Agent is not null) yield return new KeyValuePair("agent",Agent); @@ -814,77 +792,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (Requisition != null) yield return Requisition; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (DoNotPerformElement != null) yield return DoNotPerformElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Occurrence != null) yield return Occurrence; - if (AsNeeded != null) yield return AsNeeded; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (PerformerType != null) yield return PerformerType; - if (Performer != null) yield return Performer; - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Specimen) { if (elem != null) yield return elem; } - foreach (var elem in BodySite) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (Requisition != null) yield return new ElementValue("requisition", Requisition); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (DoNotPerformElement != null) yield return new ElementValue("doNotPerform", DoNotPerformElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AsNeeded != null) yield return new ElementValue("asNeeded", AsNeeded); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (PerformerType != null) yield return new ElementValue("performerType", PerformerType); - if (Performer != null) yield return new ElementValue("performer", Performer); - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Specimen) { if (elem != null) yield return new ElementValue("specimen", elem); } - foreach (var elem in BodySite) { if (elem != null) yield return new ElementValue("bodySite", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -972,7 +880,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1060,7 +968,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs index a41fb5d822..edabb03eab 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcessRequest.cs @@ -183,27 +183,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SequenceLinkIdElement != null) yield return SequenceLinkIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SequenceLinkIdElement != null) yield return new ElementValue("sequenceLinkId", SequenceLinkIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -216,7 +196,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -229,7 +209,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SequenceLinkIdElement is not null) yield return new KeyValuePair("sequenceLinkId",SequenceLinkIdElement); @@ -662,55 +642,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (ActionElement != null) yield return ActionElement; - if (Target != null) yield return Target; - if (CreatedElement != null) yield return CreatedElement; - if (Provider != null) yield return Provider; - if (Organization != null) yield return Organization; - if (Request != null) yield return Request; - if (Response != null) yield return Response; - if (NullifyElement != null) yield return NullifyElement; - if (ReferenceElement != null) yield return ReferenceElement; - foreach (var elem in Item) { if (elem != null) yield return elem; } - foreach (var elem in IncludeElement) { if (elem != null) yield return elem; } - foreach (var elem in ExcludeElement) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ActionElement != null) yield return new ElementValue("action", ActionElement); - if (Target != null) yield return new ElementValue("target", Target); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Provider != null) yield return new ElementValue("provider", Provider); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Request != null) yield return new ElementValue("request", Request); - if (Response != null) yield return new ElementValue("response", Response); - if (NullifyElement != null) yield return new ElementValue("nullify", NullifyElement); - if (ReferenceElement != null) yield return new ElementValue("reference", ReferenceElement); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - foreach (var elem in IncludeElement) { if (elem != null) yield return new ElementValue("include", elem); } - foreach (var elem in ExcludeElement) { if (elem != null) yield return new ElementValue("exclude", elem); } - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -765,7 +697,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -820,7 +752,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs index 77d69bb48d..224d9b5ee6 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ProcessResponse.cs @@ -165,29 +165,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (TextElement != null) yield return TextElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (TextElement != null) yield return new ElementValue("text", TextElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -203,7 +181,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -219,7 +197,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -550,51 +528,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (CreatedElement != null) yield return CreatedElement; - if (Organization != null) yield return Organization; - if (Request != null) yield return Request; - if (Outcome != null) yield return Outcome; - if (DispositionElement != null) yield return DispositionElement; - if (RequestProvider != null) yield return RequestProvider; - if (RequestOrganization != null) yield return RequestOrganization; - if (Form != null) yield return Form; - foreach (var elem in ProcessNote) { if (elem != null) yield return elem; } - foreach (var elem in Error) { if (elem != null) yield return elem; } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (CreatedElement != null) yield return new ElementValue("created", CreatedElement); - if (Organization != null) yield return new ElementValue("organization", Organization); - if (Request != null) yield return new ElementValue("request", Request); - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (DispositionElement != null) yield return new ElementValue("disposition", DispositionElement); - if (RequestProvider != null) yield return new ElementValue("requestProvider", RequestProvider); - if (RequestOrganization != null) yield return new ElementValue("requestOrganization", RequestOrganization); - if (Form != null) yield return new ElementValue("form", Form); - foreach (var elem in ProcessNote) { if (elem != null) yield return new ElementValue("processNote", elem); } - foreach (var elem in Error) { if (elem != null) yield return new ElementValue("error", elem); } - foreach (var elem in CommunicationRequest) { if (elem != null) yield return new ElementValue("communicationRequest", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -643,7 +577,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -692,7 +626,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs b/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs index 171abc6ff8..6ed7d1d528 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Provenance.cs @@ -230,33 +230,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Role) { if (elem != null) yield return elem; } - if (Who != null) yield return Who; - if (OnBehalfOf != null) yield return OnBehalfOf; - if (RelatedAgentType != null) yield return RelatedAgentType; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Role) { if (elem != null) yield return new ElementValue("role", elem); } - if (Who != null) yield return new ElementValue("who", Who); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - if (RelatedAgentType != null) yield return new ElementValue("relatedAgentType", RelatedAgentType); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -278,7 +252,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -300,7 +274,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Role?.Any() == true) yield return new KeyValuePair("role",Role); @@ -440,31 +414,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RoleElement != null) yield return RoleElement; - if (What != null) yield return What; - foreach (var elem in Agent) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RoleElement != null) yield return new ElementValue("role", RoleElement); - if (What != null) yield return new ElementValue("what", What); - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -483,7 +433,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -502,7 +452,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RoleElement is not null) yield return new KeyValuePair("role",RoleElement); @@ -760,45 +710,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Target) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (RecordedElement != null) yield return RecordedElement; - foreach (var elem in PolicyElement) { if (elem != null) yield return elem; } - if (Location != null) yield return Location; - foreach (var elem in Reason) { if (elem != null) yield return elem; } - if (Activity != null) yield return Activity; - foreach (var elem in Agent) { if (elem != null) yield return elem; } - foreach (var elem in Entity) { if (elem != null) yield return elem; } - foreach (var elem in Signature) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (RecordedElement != null) yield return new ElementValue("recorded", RecordedElement); - foreach (var elem in PolicyElement) { if (elem != null) yield return new ElementValue("policy", elem); } - if (Location != null) yield return new ElementValue("location", Location); - foreach (var elem in Reason) { if (elem != null) yield return new ElementValue("reason", elem); } - if (Activity != null) yield return new ElementValue("activity", Activity); - foreach (var elem in Agent) { if (elem != null) yield return new ElementValue("agent", elem); } - foreach (var elem in Entity) { if (elem != null) yield return new ElementValue("entity", elem); } - foreach (var elem in Signature) { if (elem != null) yield return new ElementValue("signature", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -838,7 +750,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -878,7 +790,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Target?.Any() == true) yield return new KeyValuePair("target",Target); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs b/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs index 3dfa393aa4..969afd9015 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Questionnaire.cs @@ -638,55 +638,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (DefinitionElement != null) yield return DefinitionElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - if (PrefixElement != null) yield return PrefixElement; - if (TextElement != null) yield return TextElement; - if (TypeElement != null) yield return TypeElement; - foreach (var elem in EnableWhen) { if (elem != null) yield return elem; } - if (RequiredElement != null) yield return RequiredElement; - if (RepeatsElement != null) yield return RepeatsElement; - if (ReadOnlyElement != null) yield return ReadOnlyElement; - if (MaxLengthElement != null) yield return MaxLengthElement; - if (Options != null) yield return Options; - foreach (var elem in Option) { if (elem != null) yield return elem; } - if (Initial != null) yield return Initial; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - if (PrefixElement != null) yield return new ElementValue("prefix", PrefixElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - foreach (var elem in EnableWhen) { if (elem != null) yield return new ElementValue("enableWhen", elem); } - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (RepeatsElement != null) yield return new ElementValue("repeats", RepeatsElement); - if (ReadOnlyElement != null) yield return new ElementValue("readOnly", ReadOnlyElement); - if (MaxLengthElement != null) yield return new ElementValue("maxLength", MaxLengthElement); - if (Options != null) yield return new ElementValue("options", Options); - foreach (var elem in Option) { if (elem != null) yield return new ElementValue("option", elem); } - if (Initial != null) yield return new ElementValue("initial", Initial); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -741,7 +693,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -796,7 +748,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -964,31 +916,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (QuestionElement != null) yield return QuestionElement; - if (HasAnswerElement != null) yield return HasAnswerElement; - if (Answer != null) yield return Answer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (QuestionElement != null) yield return new ElementValue("question", QuestionElement); - if (HasAnswerElement != null) yield return new ElementValue("hasAnswer", HasAnswerElement); - if (Answer != null) yield return new ElementValue("answer", Answer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1007,7 +935,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1026,7 +954,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (QuestionElement is not null) yield return new KeyValuePair("question",QuestionElement); @@ -1112,27 +1040,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1145,7 +1053,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1158,7 +1066,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -1809,67 +1717,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (PurposeElement != null) yield return PurposeElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in SubjectTypeElement) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in SubjectTypeElement) { if (elem != null) yield return new ElementValue("subjectType", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1942,7 +1790,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2015,7 +1863,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs b/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs index c49032f8cf..ae392084c5 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/QuestionnaireResponse.cs @@ -311,37 +311,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LinkIdElement != null) yield return LinkIdElement; - if (DefinitionElement != null) yield return DefinitionElement; - if (TextElement != null) yield return TextElement; - if (Subject != null) yield return Subject; - foreach (var elem in Answer) { if (elem != null) yield return elem; } - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LinkIdElement != null) yield return new ElementValue("linkId", LinkIdElement); - if (DefinitionElement != null) yield return new ElementValue("definition", DefinitionElement); - if (TextElement != null) yield return new ElementValue("text", TextElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - foreach (var elem in Answer) { if (elem != null) yield return new ElementValue("answer", elem); } - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -369,7 +339,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -397,7 +367,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LinkIdElement is not null) yield return new KeyValuePair("linkId",LinkIdElement); @@ -503,29 +473,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -541,7 +489,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -557,7 +505,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -839,47 +787,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Parent) { if (elem != null) yield return elem; } - if (Questionnaire != null) yield return Questionnaire; - if (StatusElement != null) yield return StatusElement; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (AuthoredElement != null) yield return AuthoredElement; - if (Author != null) yield return Author; - if (Source != null) yield return Source; - foreach (var elem in Item) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Parent) { if (elem != null) yield return new ElementValue("parent", elem); } - if (Questionnaire != null) yield return new ElementValue("questionnaire", Questionnaire); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (AuthoredElement != null) yield return new ElementValue("authored", AuthoredElement); - if (Author != null) yield return new ElementValue("author", Author); - if (Source != null) yield return new ElementValue("source", Source); - foreach (var elem in Item) { if (elem != null) yield return new ElementValue("item", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -922,7 +830,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -965,7 +873,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Ratio.cs b/src/Hl7.Fhir.STU3/Model/Generated/Ratio.cs index e8b7bfd619..0930b1525d 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Ratio.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Ratio.cs @@ -130,29 +130,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Numerator != null) yield return Numerator; - if (Denominator != null) yield return Denominator; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Numerator != null) yield return new ElementValue("numerator", Numerator); - if (Denominator != null) yield return new ElementValue("denominator", Denominator); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -168,7 +146,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -184,7 +162,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Numerator is not null) yield return new KeyValuePair("numerator",Numerator); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs index 4148eddf47..1320b93995 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ReferralRequest.cs @@ -151,29 +151,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Agent != null) yield return Agent; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Agent != null) yield return new ElementValue("agent", Agent); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -189,7 +167,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -205,7 +183,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Agent is not null) yield return new KeyValuePair("agent",Agent); @@ -757,71 +735,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (Type != null) yield return Type; - if (PriorityElement != null) yield return PriorityElement; - foreach (var elem in ServiceRequested) { if (elem != null) yield return elem; } - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - if (Specialty != null) yield return Specialty; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - foreach (var elem in ReasonCode) { if (elem != null) yield return elem; } - foreach (var elem in ReasonReference) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in SupportingInfo) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (Type != null) yield return new ElementValue("type", Type); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - foreach (var elem in ServiceRequested) { if (elem != null) yield return new ElementValue("serviceRequested", elem); } - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - if (Specialty != null) yield return new ElementValue("specialty", Specialty); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - foreach (var elem in ReasonCode) { if (elem != null) yield return new ElementValue("reasonCode", elem); } - foreach (var elem in ReasonReference) { if (elem != null) yield return new ElementValue("reasonReference", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in SupportingInfo) { if (elem != null) yield return new ElementValue("supportingInfo", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -900,7 +814,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -979,7 +893,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RelatedArtifact.cs b/src/Hl7.Fhir.STU3/Model/Generated/RelatedArtifact.cs index d7557c4c0b..aa507447f9 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/RelatedArtifact.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/RelatedArtifact.cs @@ -331,37 +331,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (DisplayElement != null) yield return DisplayElement; - if (CitationElement != null) yield return CitationElement; - if (UrlElement != null) yield return UrlElement; - if (Document != null) yield return Document; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - if (CitationElement != null) yield return new ElementValue("citation", CitationElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Document != null) yield return new ElementValue("document", Document); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -389,7 +359,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -417,7 +387,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs b/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs index b31780143d..b901e245d8 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/RelatedPerson.cs @@ -341,47 +341,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (Patient != null) yield return Patient; - if (Relationship != null) yield return Relationship; - foreach (var elem in Name) { if (elem != null) yield return elem; } - foreach (var elem in Telecom) { if (elem != null) yield return elem; } - if (GenderElement != null) yield return GenderElement; - if (BirthDateElement != null) yield return BirthDateElement; - foreach (var elem in Address) { if (elem != null) yield return elem; } - foreach (var elem in Photo) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Relationship != null) yield return new ElementValue("relationship", Relationship); - foreach (var elem in Name) { if (elem != null) yield return new ElementValue("name", elem); } - foreach (var elem in Telecom) { if (elem != null) yield return new ElementValue("telecom", elem); } - if (GenderElement != null) yield return new ElementValue("gender", GenderElement); - if (BirthDateElement != null) yield return new ElementValue("birthDate", BirthDateElement); - foreach (var elem in Address) { if (elem != null) yield return new ElementValue("address", elem); } - foreach (var elem in Photo) { if (elem != null) yield return new ElementValue("photo", elem); } - if (Period != null) yield return new ElementValue("period", Period); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -424,7 +384,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -467,7 +427,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs b/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs index f792a40c20..b3425ff1f3 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/RequestGroup.cs @@ -587,61 +587,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LabelElement != null) yield return LabelElement; - if (TitleElement != null) yield return TitleElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (TextEquivalentElement != null) yield return TextEquivalentElement; - foreach (var elem in Code) { if (elem != null) yield return elem; } - foreach (var elem in Documentation) { if (elem != null) yield return elem; } - foreach (var elem in Condition) { if (elem != null) yield return elem; } - foreach (var elem in RelatedAction) { if (elem != null) yield return elem; } - if (Timing != null) yield return Timing; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Type != null) yield return Type; - if (GroupingBehaviorElement != null) yield return GroupingBehaviorElement; - if (SelectionBehaviorElement != null) yield return SelectionBehaviorElement; - if (RequiredBehaviorElement != null) yield return RequiredBehaviorElement; - if (PrecheckBehaviorElement != null) yield return PrecheckBehaviorElement; - if (CardinalityBehaviorElement != null) yield return CardinalityBehaviorElement; - if (Resource != null) yield return Resource; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (TextEquivalentElement != null) yield return new ElementValue("textEquivalent", TextEquivalentElement); - foreach (var elem in Code) { if (elem != null) yield return new ElementValue("code", elem); } - foreach (var elem in Documentation) { if (elem != null) yield return new ElementValue("documentation", elem); } - foreach (var elem in Condition) { if (elem != null) yield return new ElementValue("condition", elem); } - foreach (var elem in RelatedAction) { if (elem != null) yield return new ElementValue("relatedAction", elem); } - if (Timing != null) yield return new ElementValue("timing", Timing); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Type != null) yield return new ElementValue("type", Type); - if (GroupingBehaviorElement != null) yield return new ElementValue("groupingBehavior", GroupingBehaviorElement); - if (SelectionBehaviorElement != null) yield return new ElementValue("selectionBehavior", SelectionBehaviorElement); - if (RequiredBehaviorElement != null) yield return new ElementValue("requiredBehavior", RequiredBehaviorElement); - if (PrecheckBehaviorElement != null) yield return new ElementValue("precheckBehavior", PrecheckBehaviorElement); - if (CardinalityBehaviorElement != null) yield return new ElementValue("cardinalityBehavior", CardinalityBehaviorElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -705,7 +651,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -769,7 +715,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LabelElement is not null) yield return new KeyValuePair("label",LabelElement); @@ -988,33 +934,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (KindElement != null) yield return KindElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (LanguageElement != null) yield return LanguageElement; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1036,7 +956,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1058,7 +978,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (KindElement is not null) yield return new KeyValuePair("kind",KindElement); @@ -1214,31 +1134,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ActionIdElement != null) yield return ActionIdElement; - if (RelationshipElement != null) yield return RelationshipElement; - if (Offset != null) yield return Offset; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ActionIdElement != null) yield return new ElementValue("actionId", ActionIdElement); - if (RelationshipElement != null) yield return new ElementValue("relationship", RelationshipElement); - if (Offset != null) yield return new ElementValue("offset", Offset); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1257,7 +1153,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1276,7 +1172,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ActionIdElement is not null) yield return new KeyValuePair("actionId",ActionIdElement); @@ -1668,55 +1564,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - foreach (var elem in Definition) { if (elem != null) yield return elem; } - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in Replaces) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - if (StatusElement != null) yield return StatusElement; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Author != null) yield return Author; - if (Reason != null) yield return Reason; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - foreach (var elem in Definition) { if (elem != null) yield return new ElementValue("definition", elem); } - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in Replaces) { if (elem != null) yield return new ElementValue("replaces", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Author != null) yield return new ElementValue("author", Author); - if (Reason != null) yield return new ElementValue("reason", Reason); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1771,7 +1619,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1826,7 +1674,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs b/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs index 094d0bb2bf..26cfc2c697 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ResearchStudy.cs @@ -246,31 +246,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -289,7 +265,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -308,7 +284,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -765,65 +741,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TitleElement != null) yield return TitleElement; - foreach (var elem in Protocol) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - foreach (var elem in Focus) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Keyword) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Enrollment) { if (elem != null) yield return elem; } - if (Period != null) yield return Period; - if (Sponsor != null) yield return Sponsor; - if (PrincipalInvestigator != null) yield return PrincipalInvestigator; - foreach (var elem in Site) { if (elem != null) yield return elem; } - if (ReasonStopped != null) yield return ReasonStopped; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in Arm) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - foreach (var elem in Protocol) { if (elem != null) yield return new ElementValue("protocol", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - foreach (var elem in Focus) { if (elem != null) yield return new ElementValue("focus", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Keyword) { if (elem != null) yield return new ElementValue("keyword", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Enrollment) { if (elem != null) yield return new ElementValue("enrollment", elem); } - if (Period != null) yield return new ElementValue("period", Period); - if (Sponsor != null) yield return new ElementValue("sponsor", Sponsor); - if (PrincipalInvestigator != null) yield return new ElementValue("principalInvestigator", PrincipalInvestigator); - foreach (var elem in Site) { if (elem != null) yield return new ElementValue("site", elem); } - if (ReasonStopped != null) yield return new ElementValue("reasonStopped", ReasonStopped); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in Arm) { if (elem != null) yield return new ElementValue("arm", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -893,7 +811,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -963,7 +881,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs b/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs index 30ea90a599..7b3e0a99cb 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ResearchSubject.cs @@ -340,41 +340,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - if (Period != null) yield return Period; - if (Study != null) yield return Study; - if (Individual != null) yield return Individual; - if (AssignedArmElement != null) yield return AssignedArmElement; - if (ActualArmElement != null) yield return ActualArmElement; - if (Consent != null) yield return Consent; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Period != null) yield return new ElementValue("period", Period); - if (Study != null) yield return new ElementValue("study", Study); - if (Individual != null) yield return new ElementValue("individual", Individual); - if (AssignedArmElement != null) yield return new ElementValue("assignedArm", AssignedArmElement); - if (ActualArmElement != null) yield return new ElementValue("actualArm", ActualArmElement); - if (Consent != null) yield return new ElementValue("consent", Consent); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -408,7 +374,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -442,7 +408,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs b/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs index 7aa7525aa3..422f813332 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/RiskAssessment.cs @@ -254,37 +254,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Outcome != null) yield return Outcome; - if (Probability != null) yield return Probability; - if (QualitativeRisk != null) yield return QualitativeRisk; - if (RelativeRiskElement != null) yield return RelativeRiskElement; - if (When != null) yield return When; - if (RationaleElement != null) yield return RationaleElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Outcome != null) yield return new ElementValue("outcome", Outcome); - if (Probability != null) yield return new ElementValue("probability", Probability); - if (QualitativeRisk != null) yield return new ElementValue("qualitativeRisk", QualitativeRisk); - if (RelativeRiskElement != null) yield return new ElementValue("relativeRisk", RelativeRiskElement); - if (When != null) yield return new ElementValue("when", When); - if (RationaleElement != null) yield return new ElementValue("rationale", RationaleElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -312,7 +282,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -340,7 +310,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Outcome is not null) yield return new KeyValuePair("outcome",Outcome); @@ -729,57 +699,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (BasedOn != null) yield return BasedOn; - if (Parent != null) yield return Parent; - if (StatusElement != null) yield return StatusElement; - if (Method != null) yield return Method; - if (Code != null) yield return Code; - if (Subject != null) yield return Subject; - if (Context != null) yield return Context; - if (Occurrence != null) yield return Occurrence; - if (Condition != null) yield return Condition; - if (Performer != null) yield return Performer; - if (Reason != null) yield return Reason; - foreach (var elem in Basis) { if (elem != null) yield return elem; } - foreach (var elem in Prediction) { if (elem != null) yield return elem; } - if (MitigationElement != null) yield return MitigationElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (BasedOn != null) yield return new ElementValue("basedOn", BasedOn); - if (Parent != null) yield return new ElementValue("parent", Parent); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Method != null) yield return new ElementValue("method", Method); - if (Code != null) yield return new ElementValue("code", Code); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (Context != null) yield return new ElementValue("context", Context); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (Condition != null) yield return new ElementValue("condition", Condition); - if (Performer != null) yield return new ElementValue("performer", Performer); - if (Reason != null) yield return new ElementValue("reason", Reason); - foreach (var elem in Basis) { if (elem != null) yield return new ElementValue("basis", elem); } - foreach (var elem in Prediction) { if (elem != null) yield return new ElementValue("prediction", elem); } - if (MitigationElement != null) yield return new ElementValue("mitigation", MitigationElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -837,7 +757,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -895,7 +815,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SampledData.cs b/src/Hl7.Fhir.STU3/Model/Generated/SampledData.cs index 36aa65c917..89f1266a1e 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/SampledData.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/SampledData.cs @@ -323,39 +323,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Origin != null) yield return Origin; - if (PeriodElement != null) yield return PeriodElement; - if (FactorElement != null) yield return FactorElement; - if (LowerLimitElement != null) yield return LowerLimitElement; - if (UpperLimitElement != null) yield return UpperLimitElement; - if (DimensionsElement != null) yield return DimensionsElement; - if (DataElement != null) yield return DataElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Origin != null) yield return new ElementValue("origin", Origin); - if (PeriodElement != null) yield return new ElementValue("period", PeriodElement); - if (FactorElement != null) yield return new ElementValue("factor", FactorElement); - if (LowerLimitElement != null) yield return new ElementValue("lowerLimit", LowerLimitElement); - if (UpperLimitElement != null) yield return new ElementValue("upperLimit", UpperLimitElement); - if (DimensionsElement != null) yield return new ElementValue("dimensions", DimensionsElement); - if (DataElement != null) yield return new ElementValue("data", DataElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -386,7 +354,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -417,7 +385,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Origin is not null) yield return new KeyValuePair("origin",Origin); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs b/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs index 18dbdfc66b..4c7ec3975b 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Schedule.cs @@ -270,41 +270,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ActiveElement != null) yield return ActiveElement; - if (ServiceCategory != null) yield return ServiceCategory; - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - foreach (var elem in Actor) { if (elem != null) yield return elem; } - if (PlanningHorizon != null) yield return PlanningHorizon; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ActiveElement != null) yield return new ElementValue("active", ActiveElement); - if (ServiceCategory != null) yield return new ElementValue("serviceCategory", ServiceCategory); - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - foreach (var elem in Actor) { if (elem != null) yield return new ElementValue("actor", elem); } - if (PlanningHorizon != null) yield return new ElementValue("planningHorizon", PlanningHorizon); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -338,7 +304,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -372,7 +338,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs b/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs index 1bee272449..537d4571ad 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/SearchParameter.cs @@ -343,29 +343,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Definition != null) yield return Definition; - if (ExpressionElement != null) yield return ExpressionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Definition != null) yield return new ElementValue("definition", Definition); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -381,7 +359,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -397,7 +375,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Definition is not null) yield return new KeyValuePair("definition",Definition); @@ -1219,73 +1197,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CodeElement != null) yield return CodeElement; - foreach (var elem in BaseElement) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (DerivedFromElement != null) yield return DerivedFromElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (XpathElement != null) yield return XpathElement; - if (XpathUsageElement != null) yield return XpathUsageElement; - foreach (var elem in TargetElement) { if (elem != null) yield return elem; } - foreach (var elem in ComparatorElement) { if (elem != null) yield return elem; } - foreach (var elem in ModifierElement) { if (elem != null) yield return elem; } - foreach (var elem in ChainElement) { if (elem != null) yield return elem; } - foreach (var elem in Component) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - foreach (var elem in BaseElement) { if (elem != null) yield return new ElementValue("base", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DerivedFromElement != null) yield return new ElementValue("derivedFrom", DerivedFromElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (XpathElement != null) yield return new ElementValue("xpath", XpathElement); - if (XpathUsageElement != null) yield return new ElementValue("xpathUsage", XpathUsageElement); - foreach (var elem in TargetElement) { if (elem != null) yield return new ElementValue("target", elem); } - foreach (var elem in ComparatorElement) { if (elem != null) yield return new ElementValue("comparator", elem); } - foreach (var elem in ModifierElement) { if (elem != null) yield return new ElementValue("modifier", elem); } - foreach (var elem in ChainElement) { if (elem != null) yield return new ElementValue("chain", elem); } - foreach (var elem in Component) { if (elem != null) yield return new ElementValue("component", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1367,7 +1279,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1449,7 +1361,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs b/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs index 54f11c3388..74c809ffac 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Sequence.cs @@ -406,41 +406,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Chromosome != null) yield return Chromosome; - if (GenomeBuildElement != null) yield return GenomeBuildElement; - if (ReferenceSeqId != null) yield return ReferenceSeqId; - if (ReferenceSeqPointer != null) yield return ReferenceSeqPointer; - if (ReferenceSeqStringElement != null) yield return ReferenceSeqStringElement; - if (StrandElement != null) yield return StrandElement; - if (WindowStartElement != null) yield return WindowStartElement; - if (WindowEndElement != null) yield return WindowEndElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Chromosome != null) yield return new ElementValue("chromosome", Chromosome); - if (GenomeBuildElement != null) yield return new ElementValue("genomeBuild", GenomeBuildElement); - if (ReferenceSeqId != null) yield return new ElementValue("referenceSeqId", ReferenceSeqId); - if (ReferenceSeqPointer != null) yield return new ElementValue("referenceSeqPointer", ReferenceSeqPointer); - if (ReferenceSeqStringElement != null) yield return new ElementValue("referenceSeqString", ReferenceSeqStringElement); - if (StrandElement != null) yield return new ElementValue("strand", StrandElement); - if (WindowStartElement != null) yield return new ElementValue("windowStart", WindowStartElement); - if (WindowEndElement != null) yield return new ElementValue("windowEnd", WindowEndElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -474,7 +440,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -508,7 +474,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Chromosome is not null) yield return new KeyValuePair("chromosome",Chromosome); @@ -766,37 +732,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (ObservedAlleleElement != null) yield return ObservedAlleleElement; - if (ReferenceAlleleElement != null) yield return ReferenceAlleleElement; - if (CigarElement != null) yield return CigarElement; - if (VariantPointer != null) yield return VariantPointer; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (ObservedAlleleElement != null) yield return new ElementValue("observedAllele", ObservedAlleleElement); - if (ReferenceAlleleElement != null) yield return new ElementValue("referenceAllele", ReferenceAlleleElement); - if (CigarElement != null) yield return new ElementValue("cigar", CigarElement); - if (VariantPointer != null) yield return new ElementValue("variantPointer", VariantPointer); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -824,7 +760,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -852,7 +788,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StartElement is not null) yield return new KeyValuePair("start",StartElement); @@ -1347,53 +1283,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (StandardSequence != null) yield return StandardSequence; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (Score != null) yield return Score; - if (Method != null) yield return Method; - if (TruthTPElement != null) yield return TruthTPElement; - if (QueryTPElement != null) yield return QueryTPElement; - if (TruthFNElement != null) yield return TruthFNElement; - if (QueryFPElement != null) yield return QueryFPElement; - if (GtFPElement != null) yield return GtFPElement; - if (PrecisionElement != null) yield return PrecisionElement; - if (RecallElement != null) yield return RecallElement; - if (FScoreElement != null) yield return FScoreElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (StandardSequence != null) yield return new ElementValue("standardSequence", StandardSequence); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (Score != null) yield return new ElementValue("score", Score); - if (Method != null) yield return new ElementValue("method", Method); - if (TruthTPElement != null) yield return new ElementValue("truthTP", TruthTPElement); - if (QueryTPElement != null) yield return new ElementValue("queryTP", QueryTPElement); - if (TruthFNElement != null) yield return new ElementValue("truthFN", TruthFNElement); - if (QueryFPElement != null) yield return new ElementValue("queryFP", QueryFPElement); - if (GtFPElement != null) yield return new ElementValue("gtFP", GtFPElement); - if (PrecisionElement != null) yield return new ElementValue("precision", PrecisionElement); - if (RecallElement != null) yield return new ElementValue("recall", RecallElement); - if (FScoreElement != null) yield return new ElementValue("fScore", FScoreElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1445,7 +1335,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1497,7 +1387,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -1780,37 +1670,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (UrlElement != null) yield return UrlElement; - if (NameElement != null) yield return NameElement; - if (DatasetIdElement != null) yield return DatasetIdElement; - if (VariantsetIdElement != null) yield return VariantsetIdElement; - if (ReadsetIdElement != null) yield return ReadsetIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DatasetIdElement != null) yield return new ElementValue("datasetId", DatasetIdElement); - if (VariantsetIdElement != null) yield return new ElementValue("variantsetId", VariantsetIdElement); - if (ReadsetIdElement != null) yield return new ElementValue("readsetId", ReadsetIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1838,7 +1698,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1866,7 +1726,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -2249,55 +2109,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (CoordinateSystemElement != null) yield return CoordinateSystemElement; - if (Patient != null) yield return Patient; - if (Specimen != null) yield return Specimen; - if (Device != null) yield return Device; - if (Performer != null) yield return Performer; - if (Quantity != null) yield return Quantity; - if (ReferenceSeq != null) yield return ReferenceSeq; - foreach (var elem in Variant) { if (elem != null) yield return elem; } - if (ObservedSeqElement != null) yield return ObservedSeqElement; - foreach (var elem in Quality) { if (elem != null) yield return elem; } - if (ReadCoverageElement != null) yield return ReadCoverageElement; - foreach (var elem in Repository) { if (elem != null) yield return elem; } - foreach (var elem in Pointer) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (CoordinateSystemElement != null) yield return new ElementValue("coordinateSystem", CoordinateSystemElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Specimen != null) yield return new ElementValue("specimen", Specimen); - if (Device != null) yield return new ElementValue("device", Device); - if (Performer != null) yield return new ElementValue("performer", Performer); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (ReferenceSeq != null) yield return new ElementValue("referenceSeq", ReferenceSeq); - foreach (var elem in Variant) { if (elem != null) yield return new ElementValue("variant", elem); } - if (ObservedSeqElement != null) yield return new ElementValue("observedSeq", ObservedSeqElement); - foreach (var elem in Quality) { if (elem != null) yield return new ElementValue("quality", elem); } - if (ReadCoverageElement != null) yield return new ElementValue("readCoverage", ReadCoverageElement); - foreach (var elem in Repository) { if (elem != null) yield return new ElementValue("repository", elem); } - foreach (var elem in Pointer) { if (elem != null) yield return new ElementValue("pointer", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2352,7 +2164,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2407,7 +2219,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs index 0b06216d19..022606ffc9 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ServiceDefinition.cs @@ -768,75 +768,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (PurposeElement != null) yield return PurposeElement; - if (UsageElement != null) yield return UsageElement; - if (ApprovalDateElement != null) yield return ApprovalDateElement; - if (LastReviewDateElement != null) yield return LastReviewDateElement; - if (EffectivePeriod != null) yield return EffectivePeriod; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - foreach (var elem in Topic) { if (elem != null) yield return elem; } - foreach (var elem in Contributor) { if (elem != null) yield return elem; } - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in RelatedArtifact) { if (elem != null) yield return elem; } - foreach (var elem in Trigger) { if (elem != null) yield return elem; } - foreach (var elem in DataRequirement) { if (elem != null) yield return elem; } - if (OperationDefinition != null) yield return OperationDefinition; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (UsageElement != null) yield return new ElementValue("usage", UsageElement); - if (ApprovalDateElement != null) yield return new ElementValue("approvalDate", ApprovalDateElement); - if (LastReviewDateElement != null) yield return new ElementValue("lastReviewDate", LastReviewDateElement); - if (EffectivePeriod != null) yield return new ElementValue("effectivePeriod", EffectivePeriod); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - foreach (var elem in Topic) { if (elem != null) yield return new ElementValue("topic", elem); } - foreach (var elem in Contributor) { if (elem != null) yield return new ElementValue("contributor", elem); } - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in RelatedArtifact) { if (elem != null) yield return new ElementValue("relatedArtifact", elem); } - foreach (var elem in Trigger) { if (elem != null) yield return new ElementValue("trigger", elem); } - foreach (var elem in DataRequirement) { if (elem != null) yield return new ElementValue("dataRequirement", elem); } - if (OperationDefinition != null) yield return new ElementValue("operationDefinition", OperationDefinition); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -921,7 +853,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1006,7 +938,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs b/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs index fd7d75e892..2c24101714 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Slot.cs @@ -418,47 +418,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (ServiceCategory != null) yield return ServiceCategory; - foreach (var elem in ServiceType) { if (elem != null) yield return elem; } - foreach (var elem in Specialty) { if (elem != null) yield return elem; } - if (AppointmentType != null) yield return AppointmentType; - if (Schedule != null) yield return Schedule; - if (StatusElement != null) yield return StatusElement; - if (StartElement != null) yield return StartElement; - if (EndElement != null) yield return EndElement; - if (OverbookedElement != null) yield return OverbookedElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (ServiceCategory != null) yield return new ElementValue("serviceCategory", ServiceCategory); - foreach (var elem in ServiceType) { if (elem != null) yield return new ElementValue("serviceType", elem); } - foreach (var elem in Specialty) { if (elem != null) yield return new ElementValue("specialty", elem); } - if (AppointmentType != null) yield return new ElementValue("appointmentType", AppointmentType); - if (Schedule != null) yield return new ElementValue("schedule", Schedule); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StartElement != null) yield return new ElementValue("start", StartElement); - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (OverbookedElement != null) yield return new ElementValue("overbooked", OverbookedElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -501,7 +461,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -544,7 +504,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs b/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs index 5cdfdec5fa..339db20369 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Specimen.cs @@ -234,35 +234,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Collector != null) yield return Collector; - if (Collected != null) yield return Collected; - if (Quantity != null) yield return Quantity; - if (Method != null) yield return Method; - if (BodySite != null) yield return BodySite; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Collector != null) yield return new ElementValue("collector", Collector); - if (Collected != null) yield return new ElementValue("collected", Collected); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Method != null) yield return new ElementValue("method", Method); - if (BodySite != null) yield return new ElementValue("bodySite", BodySite); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -287,7 +259,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -312,7 +284,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Collector is not null) yield return new KeyValuePair("collector",Collector); @@ -467,33 +439,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (DescriptionElement != null) yield return DescriptionElement; - if (Procedure != null) yield return Procedure; - foreach (var elem in Additive) { if (elem != null) yield return elem; } - if (Time != null) yield return Time; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Procedure != null) yield return new ElementValue("procedure", Procedure); - foreach (var elem in Additive) { if (elem != null) yield return new ElementValue("additive", elem); } - if (Time != null) yield return new ElementValue("time", Time); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -515,7 +461,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -537,7 +483,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (DescriptionElement is not null) yield return new KeyValuePair("description",DescriptionElement); @@ -723,37 +669,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - if (Type != null) yield return Type; - if (Capacity != null) yield return Capacity; - if (SpecimenQuantity != null) yield return SpecimenQuantity; - if (Additive != null) yield return Additive; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Capacity != null) yield return new ElementValue("capacity", Capacity); - if (SpecimenQuantity != null) yield return new ElementValue("specimenQuantity", SpecimenQuantity); - if (Additive != null) yield return new ElementValue("additive", Additive); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -781,7 +697,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -809,7 +725,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); @@ -1107,49 +1023,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (AccessionIdentifier != null) yield return AccessionIdentifier; - if (StatusElement != null) yield return StatusElement; - if (Type != null) yield return Type; - if (Subject != null) yield return Subject; - if (ReceivedTimeElement != null) yield return ReceivedTimeElement; - foreach (var elem in Parent) { if (elem != null) yield return elem; } - foreach (var elem in Request) { if (elem != null) yield return elem; } - if (Collection != null) yield return Collection; - foreach (var elem in Processing) { if (elem != null) yield return elem; } - foreach (var elem in Container) { if (elem != null) yield return elem; } - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (AccessionIdentifier != null) yield return new ElementValue("accessionIdentifier", AccessionIdentifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Type != null) yield return new ElementValue("type", Type); - if (Subject != null) yield return new ElementValue("subject", Subject); - if (ReceivedTimeElement != null) yield return new ElementValue("receivedTime", ReceivedTimeElement); - foreach (var elem in Parent) { if (elem != null) yield return new ElementValue("parent", elem); } - foreach (var elem in Request) { if (elem != null) yield return new ElementValue("request", elem); } - if (Collection != null) yield return new ElementValue("collection", Collection); - foreach (var elem in Processing) { if (elem != null) yield return new ElementValue("processing", elem); } - foreach (var elem in Container) { if (elem != null) yield return new ElementValue("container", elem); } - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1195,7 +1069,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1241,7 +1115,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs index ad81b424ff..61c2cb4b23 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/StructureDefinition.cs @@ -335,33 +335,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentityElement != null) yield return IdentityElement; - if (UriElement != null) yield return UriElement; - if (NameElement != null) yield return NameElement; - if (CommentElement != null) yield return CommentElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentityElement != null) yield return new ElementValue("identity", IdentityElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (CommentElement != null) yield return new ElementValue("comment", CommentElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -383,7 +357,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -405,7 +379,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentityElement is not null) yield return new KeyValuePair("identity",IdentityElement); @@ -488,27 +462,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Element) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Element) { if (elem != null) yield return new ElementValue("element", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -521,7 +475,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -534,7 +488,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Element?.Any() == true) yield return new KeyValuePair("element",Element); @@ -614,27 +568,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Element) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Element) { if (elem != null) yield return new ElementValue("element", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -647,7 +581,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -660,7 +594,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Element?.Any() == true) yield return new KeyValuePair("element",Element); @@ -1542,81 +1476,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in Keyword) { if (elem != null) yield return elem; } - if (FhirVersionElement != null) yield return FhirVersionElement; - foreach (var elem in Mapping) { if (elem != null) yield return elem; } - if (KindElement != null) yield return KindElement; - if (AbstractElement != null) yield return AbstractElement; - if (ContextTypeElement != null) yield return ContextTypeElement; - foreach (var elem in ContextElement) { if (elem != null) yield return elem; } - foreach (var elem in ContextInvariantElement) { if (elem != null) yield return elem; } - if (TypeElement != null) yield return TypeElement; - if (BaseDefinitionElement != null) yield return BaseDefinitionElement; - if (DerivationElement != null) yield return DerivationElement; - if (Snapshot != null) yield return Snapshot; - if (Differential != null) yield return Differential; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in Keyword) { if (elem != null) yield return new ElementValue("keyword", elem); } - if (FhirVersionElement != null) yield return new ElementValue("fhirVersion", FhirVersionElement); - foreach (var elem in Mapping) { if (elem != null) yield return new ElementValue("mapping", elem); } - if (KindElement != null) yield return new ElementValue("kind", KindElement); - if (AbstractElement != null) yield return new ElementValue("abstract", AbstractElement); - if (ContextTypeElement != null) yield return new ElementValue("contextType", ContextTypeElement); - foreach (var elem in ContextElement) { if (elem != null) yield return new ElementValue("context", elem); } - foreach (var elem in ContextInvariantElement) { if (elem != null) yield return new ElementValue("contextInvariant", elem); } - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (BaseDefinitionElement != null) yield return new ElementValue("baseDefinition", BaseDefinitionElement); - if (DerivationElement != null) yield return new ElementValue("derivation", DerivationElement); - if (Snapshot != null) yield return new ElementValue("snapshot", Snapshot); - if (Differential != null) yield return new ElementValue("differential", Differential); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1710,7 +1570,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1804,7 +1664,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs b/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs index 448ea855f2..917cdfb3a6 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/StructureMap.cs @@ -544,33 +544,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (ModeElement != null) yield return ModeElement; - if (AliasElement != null) yield return AliasElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (AliasElement != null) yield return new ElementValue("alias", AliasElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -592,7 +566,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -614,7 +588,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); @@ -854,37 +828,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ExtendsElement != null) yield return ExtendsElement; - if (TypeModeElement != null) yield return TypeModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ExtendsElement != null) yield return new ElementValue("extends", ExtendsElement); - if (TypeModeElement != null) yield return new ElementValue("typeMode", TypeModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -912,7 +856,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -940,7 +884,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1149,33 +1093,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (TypeElement != null) yield return TypeElement; - if (ModeElement != null) yield return ModeElement; - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (ModeElement != null) yield return new ElementValue("mode", ModeElement); - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1197,7 +1115,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1219,7 +1137,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1419,37 +1337,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in Source) { if (elem != null) yield return elem; } - foreach (var elem in Target) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - foreach (var elem in Dependent) { if (elem != null) yield return elem; } - if (DocumentationElement != null) yield return DocumentationElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in Source) { if (elem != null) yield return new ElementValue("source", elem); } - foreach (var elem in Target) { if (elem != null) yield return new ElementValue("target", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - foreach (var elem in Dependent) { if (elem != null) yield return new ElementValue("dependent", elem); } - if (DocumentationElement != null) yield return new ElementValue("documentation", DocumentationElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1477,7 +1365,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1505,7 +1393,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1897,45 +1785,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContextElement != null) yield return ContextElement; - if (MinElement != null) yield return MinElement; - if (MaxElement != null) yield return MaxElement; - if (TypeElement != null) yield return TypeElement; - if (DefaultValue != null) yield return DefaultValue; - if (ElementElement != null) yield return ElementElement; - if (ListModeElement != null) yield return ListModeElement; - if (VariableElement != null) yield return VariableElement; - if (ConditionElement != null) yield return ConditionElement; - if (CheckElement != null) yield return CheckElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContextElement != null) yield return new ElementValue("context", ContextElement); - if (MinElement != null) yield return new ElementValue("min", MinElement); - if (MaxElement != null) yield return new ElementValue("max", MaxElement); - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (DefaultValue != null) yield return new ElementValue("defaultValue", DefaultValue); - if (ElementElement != null) yield return new ElementValue("element", ElementElement); - if (ListModeElement != null) yield return new ElementValue("listMode", ListModeElement); - if (VariableElement != null) yield return new ElementValue("variable", VariableElement); - if (ConditionElement != null) yield return new ElementValue("condition", ConditionElement); - if (CheckElement != null) yield return new ElementValue("check", CheckElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1975,7 +1825,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2015,7 +1865,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContextElement is not null) yield return new KeyValuePair("context",ContextElement); @@ -2346,41 +2196,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ContextElement != null) yield return ContextElement; - if (ContextTypeElement != null) yield return ContextTypeElement; - if (ElementElement != null) yield return ElementElement; - if (VariableElement != null) yield return VariableElement; - foreach (var elem in ListModeElement) { if (elem != null) yield return elem; } - if (ListRuleIdElement != null) yield return ListRuleIdElement; - if (TransformElement != null) yield return TransformElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ContextElement != null) yield return new ElementValue("context", ContextElement); - if (ContextTypeElement != null) yield return new ElementValue("contextType", ContextTypeElement); - if (ElementElement != null) yield return new ElementValue("element", ElementElement); - if (VariableElement != null) yield return new ElementValue("variable", VariableElement); - foreach (var elem in ListModeElement) { if (elem != null) yield return new ElementValue("listMode", elem); } - if (ListRuleIdElement != null) yield return new ElementValue("listRuleId", ListRuleIdElement); - if (TransformElement != null) yield return new ElementValue("transform", TransformElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2414,7 +2230,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2448,7 +2264,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ContextElement is not null) yield return new KeyValuePair("context",ContextElement); @@ -2534,27 +2350,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2567,7 +2363,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2580,7 +2376,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Value is not null) yield return new KeyValuePair("value",Value); @@ -2710,29 +2506,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - foreach (var elem in VariableElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - foreach (var elem in VariableElement) { if (elem != null) yield return new ElementValue("variable", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2748,7 +2522,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2764,7 +2538,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -3331,61 +3105,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in Structure) { if (elem != null) yield return elem; } - foreach (var elem in ImportElement) { if (elem != null) yield return elem; } - foreach (var elem in Group) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in Structure) { if (elem != null) yield return new ElementValue("structure", elem); } - foreach (var elem in ImportElement) { if (elem != null) yield return new ElementValue("import", elem); } - foreach (var elem in Group) { if (elem != null) yield return new ElementValue("group", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3449,7 +3169,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3513,7 +3233,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs b/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs index 8f57fabaef..eb69ab0806 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Subscription.cs @@ -328,33 +328,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (EndpointElement != null) yield return EndpointElement; - if (PayloadElement != null) yield return PayloadElement; - foreach (var elem in HeaderElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (EndpointElement != null) yield return new ElementValue("endpoint", EndpointElement); - if (PayloadElement != null) yield return new ElementValue("payload", PayloadElement); - foreach (var elem in HeaderElement) { if (elem != null) yield return new ElementValue("header", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -376,7 +350,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -398,7 +372,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -675,41 +649,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (EndElement != null) yield return EndElement; - if (ReasonElement != null) yield return ReasonElement; - if (CriteriaElement != null) yield return CriteriaElement; - if (ErrorElement != null) yield return ErrorElement; - if (Channel != null) yield return Channel; - foreach (var elem in Tag) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (EndElement != null) yield return new ElementValue("end", EndElement); - if (ReasonElement != null) yield return new ElementValue("reason", ReasonElement); - if (CriteriaElement != null) yield return new ElementValue("criteria", CriteriaElement); - if (ErrorElement != null) yield return new ElementValue("error", ErrorElement); - if (Channel != null) yield return new ElementValue("channel", Channel); - foreach (var elem in Tag) { if (elem != null) yield return new ElementValue("tag", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -743,7 +683,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -777,7 +717,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (StatusElement is not null) yield return new KeyValuePair("status",StatusElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs b/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs index 11ee00031e..13a1634055 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Substance.cs @@ -205,31 +205,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (ExpiryElement != null) yield return ExpiryElement; - if (Quantity != null) yield return Quantity; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (ExpiryElement != null) yield return new ElementValue("expiry", ExpiryElement); - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -248,7 +224,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -267,7 +243,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); @@ -369,29 +345,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Substance != null) yield return Substance; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Substance != null) yield return new ElementValue("substance", Substance); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -407,7 +361,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -423,7 +377,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -630,39 +584,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - foreach (var elem in Category) { if (elem != null) yield return elem; } - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Instance) { if (elem != null) yield return elem; } - foreach (var elem in Ingredient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - foreach (var elem in Category) { if (elem != null) yield return new ElementValue("category", elem); } - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Instance) { if (elem != null) yield return new ElementValue("instance", elem); } - foreach (var elem in Ingredient) { if (elem != null) yield return new ElementValue("ingredient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -693,7 +615,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -724,7 +646,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs b/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs index 1f28cc8785..c22818ec5d 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/SupplyDelivery.cs @@ -206,29 +206,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -244,7 +222,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -260,7 +238,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -524,47 +502,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (Type != null) yield return Type; - if (SuppliedItem != null) yield return SuppliedItem; - if (Occurrence != null) yield return Occurrence; - if (Supplier != null) yield return Supplier; - if (Destination != null) yield return Destination; - foreach (var elem in Receiver) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Type != null) yield return new ElementValue("type", Type); - if (SuppliedItem != null) yield return new ElementValue("suppliedItem", SuppliedItem); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (Supplier != null) yield return new ElementValue("supplier", Supplier); - if (Destination != null) yield return new ElementValue("destination", Destination); - foreach (var elem in Receiver) { if (elem != null) yield return new ElementValue("receiver", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -607,7 +545,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -650,7 +588,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs b/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs index 7e9a41489b..250d1cb3fb 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/SupplyRequest.cs @@ -200,29 +200,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Quantity != null) yield return Quantity; - if (Item != null) yield return Item; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Quantity != null) yield return new ElementValue("quantity", Quantity); - if (Item != null) yield return new ElementValue("item", Item); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -238,7 +216,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -254,7 +232,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Quantity is not null) yield return new KeyValuePair("quantity",Quantity); @@ -355,29 +333,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Agent != null) yield return Agent; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Agent != null) yield return new ElementValue("agent", Agent); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -393,7 +349,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -409,7 +365,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Agent is not null) yield return new KeyValuePair("agent",Agent); @@ -723,49 +679,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (StatusElement != null) yield return StatusElement; - if (Category != null) yield return Category; - if (PriorityElement != null) yield return PriorityElement; - if (OrderedItem != null) yield return OrderedItem; - if (Occurrence != null) yield return Occurrence; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (Requester != null) yield return Requester; - foreach (var elem in Supplier) { if (elem != null) yield return elem; } - if (Reason != null) yield return Reason; - if (DeliverFrom != null) yield return DeliverFrom; - if (DeliverTo != null) yield return DeliverTo; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Category != null) yield return new ElementValue("category", Category); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (OrderedItem != null) yield return new ElementValue("orderedItem", OrderedItem); - if (Occurrence != null) yield return new ElementValue("occurrence", Occurrence); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in Supplier) { if (elem != null) yield return new ElementValue("supplier", elem); } - if (Reason != null) yield return new ElementValue("reason", Reason); - if (DeliverFrom != null) yield return new ElementValue("deliverFrom", DeliverFrom); - if (DeliverTo != null) yield return new ElementValue("deliverTo", DeliverTo); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -811,7 +725,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -857,7 +771,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Task.cs b/src/Hl7.Fhir.STU3/Model/Generated/Task.cs index 46c34603ad..0dbb342238 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Task.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Task.cs @@ -230,29 +230,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Agent != null) yield return Agent; - if (OnBehalfOf != null) yield return OnBehalfOf; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Agent != null) yield return new ElementValue("agent", Agent); - if (OnBehalfOf != null) yield return new ElementValue("onBehalfOf", OnBehalfOf); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -268,7 +246,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -284,7 +262,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Agent is not null) yield return new KeyValuePair("agent",Agent); @@ -417,31 +395,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RepetitionsElement != null) yield return RepetitionsElement; - if (Period != null) yield return Period; - foreach (var elem in Recipient) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RepetitionsElement != null) yield return new ElementValue("repetitions", RepetitionsElement); - if (Period != null) yield return new ElementValue("period", Period); - foreach (var elem in Recipient) { if (elem != null) yield return new ElementValue("recipient", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -460,7 +414,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -479,7 +433,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RepetitionsElement is not null) yield return new KeyValuePair("repetitions",RepetitionsElement); @@ -581,29 +535,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -619,7 +551,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -635,7 +567,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -736,29 +668,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -774,7 +684,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -790,7 +700,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -1418,79 +1328,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (Definition != null) yield return Definition; - foreach (var elem in BasedOn) { if (elem != null) yield return elem; } - if (GroupIdentifier != null) yield return GroupIdentifier; - foreach (var elem in PartOf) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (StatusReason != null) yield return StatusReason; - if (BusinessStatus != null) yield return BusinessStatus; - if (IntentElement != null) yield return IntentElement; - if (PriorityElement != null) yield return PriorityElement; - if (Code != null) yield return Code; - if (DescriptionElement != null) yield return DescriptionElement; - if (Focus != null) yield return Focus; - if (For != null) yield return For; - if (Context != null) yield return Context; - if (ExecutionPeriod != null) yield return ExecutionPeriod; - if (AuthoredOnElement != null) yield return AuthoredOnElement; - if (LastModifiedElement != null) yield return LastModifiedElement; - if (Requester != null) yield return Requester; - foreach (var elem in PerformerType) { if (elem != null) yield return elem; } - if (Owner != null) yield return Owner; - if (Reason != null) yield return Reason; - foreach (var elem in Note) { if (elem != null) yield return elem; } - foreach (var elem in RelevantHistory) { if (elem != null) yield return elem; } - if (Restriction != null) yield return Restriction; - foreach (var elem in Input) { if (elem != null) yield return elem; } - foreach (var elem in Output) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (Definition != null) yield return new ElementValue("definition", Definition); - foreach (var elem in BasedOn) { if (elem != null) yield return new ElementValue("basedOn", elem); } - if (GroupIdentifier != null) yield return new ElementValue("groupIdentifier", GroupIdentifier); - foreach (var elem in PartOf) { if (elem != null) yield return new ElementValue("partOf", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (StatusReason != null) yield return new ElementValue("statusReason", StatusReason); - if (BusinessStatus != null) yield return new ElementValue("businessStatus", BusinessStatus); - if (IntentElement != null) yield return new ElementValue("intent", IntentElement); - if (PriorityElement != null) yield return new ElementValue("priority", PriorityElement); - if (Code != null) yield return new ElementValue("code", Code); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (Focus != null) yield return new ElementValue("focus", Focus); - if (For != null) yield return new ElementValue("for", For); - if (Context != null) yield return new ElementValue("context", Context); - if (ExecutionPeriod != null) yield return new ElementValue("executionPeriod", ExecutionPeriod); - if (AuthoredOnElement != null) yield return new ElementValue("authoredOn", AuthoredOnElement); - if (LastModifiedElement != null) yield return new ElementValue("lastModified", LastModifiedElement); - if (Requester != null) yield return new ElementValue("requester", Requester); - foreach (var elem in PerformerType) { if (elem != null) yield return new ElementValue("performerType", elem); } - if (Owner != null) yield return new ElementValue("owner", Owner); - if (Reason != null) yield return new ElementValue("reason", Reason); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - foreach (var elem in RelevantHistory) { if (elem != null) yield return new ElementValue("relevantHistory", elem); } - if (Restriction != null) yield return new ElementValue("restriction", Restriction); - foreach (var elem in Input) { if (elem != null) yield return new ElementValue("input", elem); } - foreach (var elem in Output) { if (elem != null) yield return new ElementValue("output", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1581,7 +1419,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1672,7 +1510,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs b/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs index aa629b8704..f9ce25eeef 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/TestReport.cs @@ -353,31 +353,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (UriElement != null) yield return UriElement; - if (DisplayElement != null) yield return DisplayElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (UriElement != null) yield return new ElementValue("uri", UriElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -396,7 +372,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -415,7 +391,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); @@ -494,27 +470,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -527,7 +483,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -540,7 +496,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -636,29 +592,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -674,7 +608,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -690,7 +624,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -859,31 +793,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResultElement != null) yield return ResultElement; - if (MessageElement != null) yield return MessageElement; - if (DetailElement != null) yield return DetailElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -902,7 +812,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -921,7 +831,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResultElement is not null) yield return new KeyValuePair("result",ResultElement); @@ -1091,31 +1001,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (ResultElement != null) yield return ResultElement; - if (MessageElement != null) yield return MessageElement; - if (DetailElement != null) yield return DetailElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (MessageElement != null) yield return new ElementValue("message", MessageElement); - if (DetailElement != null) yield return new ElementValue("detail", DetailElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1134,7 +1020,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1153,7 +1039,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (ResultElement is not null) yield return new KeyValuePair("result",ResultElement); @@ -1300,31 +1186,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1343,7 +1205,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1362,7 +1224,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -1460,29 +1322,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1498,7 +1338,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1514,7 +1354,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -1595,27 +1435,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1628,7 +1448,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1641,7 +1461,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -1722,27 +1542,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1755,7 +1555,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1768,7 +1568,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -2128,49 +1928,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Identifier != null) yield return Identifier; - if (NameElement != null) yield return NameElement; - if (StatusElement != null) yield return StatusElement; - if (TestScript != null) yield return TestScript; - if (ResultElement != null) yield return ResultElement; - if (ScoreElement != null) yield return ScoreElement; - if (TesterElement != null) yield return TesterElement; - if (IssuedElement != null) yield return IssuedElement; - foreach (var elem in Participant) { if (elem != null) yield return elem; } - if (Setup != null) yield return Setup; - foreach (var elem in Test) { if (elem != null) yield return elem; } - if (Teardown != null) yield return Teardown; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (TestScript != null) yield return new ElementValue("testScript", TestScript); - if (ResultElement != null) yield return new ElementValue("result", ResultElement); - if (ScoreElement != null) yield return new ElementValue("score", ScoreElement); - if (TesterElement != null) yield return new ElementValue("tester", TesterElement); - if (IssuedElement != null) yield return new ElementValue("issued", IssuedElement); - foreach (var elem in Participant) { if (elem != null) yield return new ElementValue("participant", elem); } - if (Setup != null) yield return new ElementValue("setup", Setup); - foreach (var elem in Test) { if (elem != null) yield return new ElementValue("test", elem); } - if (Teardown != null) yield return new ElementValue("teardown", Teardown); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2216,7 +1974,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2262,7 +2020,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier is not null) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs b/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs index ae3a855c25..2e7726dc87 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/TestScript.cs @@ -428,29 +428,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IndexElement != null) yield return IndexElement; - if (Profile != null) yield return Profile; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IndexElement != null) yield return new ElementValue("index", IndexElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -466,7 +444,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -482,7 +460,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IndexElement is not null) yield return new KeyValuePair("index",IndexElement); @@ -600,29 +578,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IndexElement != null) yield return IndexElement; - if (Profile != null) yield return Profile; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IndexElement != null) yield return new ElementValue("index", IndexElement); - if (Profile != null) yield return new ElementValue("profile", Profile); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -638,7 +594,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -654,7 +610,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IndexElement is not null) yield return new KeyValuePair("index",IndexElement); @@ -752,29 +708,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Link) { if (elem != null) yield return elem; } - foreach (var elem in Capability) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Link) { if (elem != null) yield return new ElementValue("link", elem); } - foreach (var elem in Capability) { if (elem != null) yield return new ElementValue("capability", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -790,7 +724,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -806,7 +740,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Link?.Any() == true) yield return new KeyValuePair("link",Link); @@ -939,29 +873,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (DescriptionElement != null) yield return DescriptionElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -977,7 +889,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -993,7 +905,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); @@ -1283,39 +1195,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RequiredElement != null) yield return RequiredElement; - if (ValidatedElement != null) yield return ValidatedElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in OriginElement) { if (elem != null) yield return elem; } - if (DestinationElement != null) yield return DestinationElement; - foreach (var elem in LinkElement) { if (elem != null) yield return elem; } - if (Capabilities != null) yield return Capabilities; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RequiredElement != null) yield return new ElementValue("required", RequiredElement); - if (ValidatedElement != null) yield return new ElementValue("validated", ValidatedElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in OriginElement) { if (elem != null) yield return new ElementValue("origin", elem); } - if (DestinationElement != null) yield return new ElementValue("destination", DestinationElement); - foreach (var elem in LinkElement) { if (elem != null) yield return new ElementValue("link", elem); } - if (Capabilities != null) yield return new ElementValue("capabilities", Capabilities); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1346,7 +1226,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1377,7 +1257,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RequiredElement is not null) yield return new KeyValuePair("required",RequiredElement); @@ -1532,31 +1412,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (AutocreateElement != null) yield return AutocreateElement; - if (AutodeleteElement != null) yield return AutodeleteElement; - if (Resource != null) yield return Resource; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (AutocreateElement != null) yield return new ElementValue("autocreate", AutocreateElement); - if (AutodeleteElement != null) yield return new ElementValue("autodelete", AutodeleteElement); - if (Resource != null) yield return new ElementValue("resource", Resource); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1575,7 +1431,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1594,7 +1450,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (AutocreateElement is not null) yield return new KeyValuePair("autocreate",AutocreateElement); @@ -1933,41 +1789,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DefaultValueElement != null) yield return DefaultValueElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (HeaderFieldElement != null) yield return HeaderFieldElement; - if (HintElement != null) yield return HintElement; - if (PathElement != null) yield return PathElement; - if (SourceIdElement != null) yield return SourceIdElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DefaultValueElement != null) yield return new ElementValue("defaultValue", DefaultValueElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (HeaderFieldElement != null) yield return new ElementValue("headerField", HeaderFieldElement); - if (HintElement != null) yield return new ElementValue("hint", HintElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2001,7 +1823,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2035,7 +1857,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2142,29 +1964,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Resource != null) yield return Resource; - foreach (var elem in Param) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Resource != null) yield return new ElementValue("resource", Resource); - foreach (var elem in Param) { if (elem != null) yield return new ElementValue("param", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2180,7 +1980,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2196,7 +1996,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Resource is not null) yield return new KeyValuePair("resource",Resource); @@ -2330,29 +2130,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2368,7 +2146,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2384,7 +2162,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2485,29 +2263,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Resource != null) yield return Resource; - foreach (var elem in Rule) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Resource != null) yield return new ElementValue("resource", Resource); - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2523,7 +2279,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2539,7 +2295,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Resource is not null) yield return new KeyValuePair("resource",Resource); @@ -2656,29 +2412,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RuleIdElement != null) yield return RuleIdElement; - foreach (var elem in Param) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RuleIdElement != null) yield return new ElementValue("ruleId", RuleIdElement); - foreach (var elem in Param) { if (elem != null) yield return new ElementValue("param", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2694,7 +2428,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2710,7 +2444,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RuleIdElement is not null) yield return new KeyValuePair("ruleId",RuleIdElement); @@ -2844,29 +2578,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2882,7 +2594,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2898,7 +2610,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2976,27 +2688,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3009,7 +2701,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3022,7 +2714,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -3118,29 +2810,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3156,7 +2826,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3172,7 +2842,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -3752,57 +3422,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Type != null) yield return Type; - if (ResourceElement != null) yield return ResourceElement; - if (LabelElement != null) yield return LabelElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (AcceptElement != null) yield return AcceptElement; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (DestinationElement != null) yield return DestinationElement; - if (EncodeRequestUrlElement != null) yield return EncodeRequestUrlElement; - if (OriginElement != null) yield return OriginElement; - if (ParamsElement != null) yield return ParamsElement; - foreach (var elem in RequestHeader) { if (elem != null) yield return elem; } - if (RequestIdElement != null) yield return RequestIdElement; - if (ResponseIdElement != null) yield return ResponseIdElement; - if (SourceIdElement != null) yield return SourceIdElement; - if (TargetIdElement != null) yield return TargetIdElement; - if (UrlElement != null) yield return UrlElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Type != null) yield return new ElementValue("type", Type); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (AcceptElement != null) yield return new ElementValue("accept", AcceptElement); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (DestinationElement != null) yield return new ElementValue("destination", DestinationElement); - if (EncodeRequestUrlElement != null) yield return new ElementValue("encodeRequestUrl", EncodeRequestUrlElement); - if (OriginElement != null) yield return new ElementValue("origin", OriginElement); - if (ParamsElement != null) yield return new ElementValue("params", ParamsElement); - foreach (var elem in RequestHeader) { if (elem != null) yield return new ElementValue("requestHeader", elem); } - if (RequestIdElement != null) yield return new ElementValue("requestId", RequestIdElement); - if (ResponseIdElement != null) yield return new ElementValue("responseId", ResponseIdElement); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - if (TargetIdElement != null) yield return new ElementValue("targetId", TargetIdElement); - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -3860,7 +3480,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -3918,7 +3538,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Type is not null) yield return new KeyValuePair("type",Type); @@ -4067,29 +3687,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (FieldElement != null) yield return FieldElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (FieldElement != null) yield return new ElementValue("field", FieldElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -4105,7 +3703,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -4121,7 +3719,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (FieldElement is not null) yield return new KeyValuePair("field",FieldElement); @@ -4978,73 +4576,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LabelElement != null) yield return LabelElement; - if (DescriptionElement != null) yield return DescriptionElement; - if (DirectionElement != null) yield return DirectionElement; - if (CompareToSourceIdElement != null) yield return CompareToSourceIdElement; - if (CompareToSourceExpressionElement != null) yield return CompareToSourceExpressionElement; - if (CompareToSourcePathElement != null) yield return CompareToSourcePathElement; - if (ContentTypeElement != null) yield return ContentTypeElement; - if (ExpressionElement != null) yield return ExpressionElement; - if (HeaderFieldElement != null) yield return HeaderFieldElement; - if (MinimumIdElement != null) yield return MinimumIdElement; - if (NavigationLinksElement != null) yield return NavigationLinksElement; - if (OperatorElement != null) yield return OperatorElement; - if (PathElement != null) yield return PathElement; - if (RequestMethodElement != null) yield return RequestMethodElement; - if (RequestURLElement != null) yield return RequestURLElement; - if (ResourceElement != null) yield return ResourceElement; - if (ResponseElement != null) yield return ResponseElement; - if (ResponseCodeElement != null) yield return ResponseCodeElement; - if (Rule != null) yield return Rule; - if (Ruleset != null) yield return Ruleset; - if (SourceIdElement != null) yield return SourceIdElement; - if (ValidateProfileIdElement != null) yield return ValidateProfileIdElement; - if (ValueElement != null) yield return ValueElement; - if (WarningOnlyElement != null) yield return WarningOnlyElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LabelElement != null) yield return new ElementValue("label", LabelElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - if (DirectionElement != null) yield return new ElementValue("direction", DirectionElement); - if (CompareToSourceIdElement != null) yield return new ElementValue("compareToSourceId", CompareToSourceIdElement); - if (CompareToSourceExpressionElement != null) yield return new ElementValue("compareToSourceExpression", CompareToSourceExpressionElement); - if (CompareToSourcePathElement != null) yield return new ElementValue("compareToSourcePath", CompareToSourcePathElement); - if (ContentTypeElement != null) yield return new ElementValue("contentType", ContentTypeElement); - if (ExpressionElement != null) yield return new ElementValue("expression", ExpressionElement); - if (HeaderFieldElement != null) yield return new ElementValue("headerField", HeaderFieldElement); - if (MinimumIdElement != null) yield return new ElementValue("minimumId", MinimumIdElement); - if (NavigationLinksElement != null) yield return new ElementValue("navigationLinks", NavigationLinksElement); - if (OperatorElement != null) yield return new ElementValue("operator", OperatorElement); - if (PathElement != null) yield return new ElementValue("path", PathElement); - if (RequestMethodElement != null) yield return new ElementValue("requestMethod", RequestMethodElement); - if (RequestURLElement != null) yield return new ElementValue("requestURL", RequestURLElement); - if (ResourceElement != null) yield return new ElementValue("resource", ResourceElement); - if (ResponseElement != null) yield return new ElementValue("response", ResponseElement); - if (ResponseCodeElement != null) yield return new ElementValue("responseCode", ResponseCodeElement); - if (Rule != null) yield return new ElementValue("rule", Rule); - if (Ruleset != null) yield return new ElementValue("ruleset", Ruleset); - if (SourceIdElement != null) yield return new ElementValue("sourceId", SourceIdElement); - if (ValidateProfileIdElement != null) yield return new ElementValue("validateProfileId", ValidateProfileIdElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - if (WarningOnlyElement != null) yield return new ElementValue("warningOnly", WarningOnlyElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5126,7 +4658,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5208,7 +4740,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LabelElement is not null) yield return new KeyValuePair("label",LabelElement); @@ -5347,29 +4879,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RuleIdElement != null) yield return RuleIdElement; - foreach (var elem in Param) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RuleIdElement != null) yield return new ElementValue("ruleId", RuleIdElement); - foreach (var elem in Param) { if (elem != null) yield return new ElementValue("param", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5385,7 +4895,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5401,7 +4911,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RuleIdElement is not null) yield return new KeyValuePair("ruleId",RuleIdElement); @@ -5536,29 +5046,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5574,7 +5062,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5590,7 +5078,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -5707,29 +5195,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RulesetIdElement != null) yield return RulesetIdElement; - foreach (var elem in Rule) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RulesetIdElement != null) yield return new ElementValue("rulesetId", RulesetIdElement); - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5745,7 +5211,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5761,7 +5227,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RulesetIdElement is not null) yield return new KeyValuePair("rulesetId",RulesetIdElement); @@ -5878,29 +5344,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (RuleIdElement != null) yield return RuleIdElement; - foreach (var elem in Param) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (RuleIdElement != null) yield return new ElementValue("ruleId", RuleIdElement); - foreach (var elem in Param) { if (elem != null) yield return new ElementValue("param", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -5916,7 +5360,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -5932,7 +5376,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (RuleIdElement is not null) yield return new KeyValuePair("ruleId",RuleIdElement); @@ -6067,29 +5511,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6105,7 +5527,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6121,7 +5543,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -6267,31 +5689,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6310,7 +5708,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6329,7 +5727,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -6427,29 +5825,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - if (Assert != null) yield return Assert; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - if (Assert != null) yield return new ElementValue("assert", Assert); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6465,7 +5841,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6481,7 +5857,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -6562,27 +5938,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Action) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Action) { if (elem != null) yield return new ElementValue("action", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6595,7 +5951,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6608,7 +5964,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Action?.Any() == true) yield return new KeyValuePair("action",Action); @@ -6689,27 +6045,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Operation != null) yield return Operation; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Operation != null) yield return new ElementValue("operation", Operation); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -6722,7 +6058,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -6735,7 +6071,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Operation is not null) yield return new KeyValuePair("operation",Operation); @@ -7417,77 +6753,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - if (Identifier != null) yield return Identifier; - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - foreach (var elem in Origin) { if (elem != null) yield return elem; } - foreach (var elem in Destination) { if (elem != null) yield return elem; } - if (Metadata != null) yield return Metadata; - foreach (var elem in Fixture) { if (elem != null) yield return elem; } - foreach (var elem in Profile) { if (elem != null) yield return elem; } - foreach (var elem in Variable) { if (elem != null) yield return elem; } - foreach (var elem in Rule) { if (elem != null) yield return elem; } - foreach (var elem in Ruleset) { if (elem != null) yield return elem; } - if (Setup != null) yield return Setup; - foreach (var elem in Test) { if (elem != null) yield return elem; } - if (Teardown != null) yield return Teardown; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - if (Identifier != null) yield return new ElementValue("identifier", Identifier); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - foreach (var elem in Origin) { if (elem != null) yield return new ElementValue("origin", elem); } - foreach (var elem in Destination) { if (elem != null) yield return new ElementValue("destination", elem); } - if (Metadata != null) yield return new ElementValue("metadata", Metadata); - foreach (var elem in Fixture) { if (elem != null) yield return new ElementValue("fixture", elem); } - foreach (var elem in Profile) { if (elem != null) yield return new ElementValue("profile", elem); } - foreach (var elem in Variable) { if (elem != null) yield return new ElementValue("variable", elem); } - foreach (var elem in Rule) { if (elem != null) yield return new ElementValue("rule", elem); } - foreach (var elem in Ruleset) { if (elem != null) yield return new ElementValue("ruleset", elem); } - if (Setup != null) yield return new ElementValue("setup", Setup); - foreach (var elem in Test) { if (elem != null) yield return new ElementValue("test", elem); } - if (Teardown != null) yield return new ElementValue("teardown", Teardown); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -7575,7 +6841,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -7663,7 +6929,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs b/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs index 1477b47a04..13cbede97b 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/Timing.cs @@ -800,55 +800,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Bounds != null) yield return Bounds; - if (CountElement != null) yield return CountElement; - if (CountMaxElement != null) yield return CountMaxElement; - if (DurationElement != null) yield return DurationElement; - if (DurationMaxElement != null) yield return DurationMaxElement; - if (DurationUnitElement != null) yield return DurationUnitElement; - if (FrequencyElement != null) yield return FrequencyElement; - if (FrequencyMaxElement != null) yield return FrequencyMaxElement; - if (PeriodElement != null) yield return PeriodElement; - if (PeriodMaxElement != null) yield return PeriodMaxElement; - if (PeriodUnitElement != null) yield return PeriodUnitElement; - foreach (var elem in DayOfWeekElement) { if (elem != null) yield return elem; } - foreach (var elem in TimeOfDayElement) { if (elem != null) yield return elem; } - foreach (var elem in WhenElement) { if (elem != null) yield return elem; } - if (OffsetElement != null) yield return OffsetElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Bounds != null) yield return new ElementValue("bounds", Bounds); - if (CountElement != null) yield return new ElementValue("count", CountElement); - if (CountMaxElement != null) yield return new ElementValue("countMax", CountMaxElement); - if (DurationElement != null) yield return new ElementValue("duration", DurationElement); - if (DurationMaxElement != null) yield return new ElementValue("durationMax", DurationMaxElement); - if (DurationUnitElement != null) yield return new ElementValue("durationUnit", DurationUnitElement); - if (FrequencyElement != null) yield return new ElementValue("frequency", FrequencyElement); - if (FrequencyMaxElement != null) yield return new ElementValue("frequencyMax", FrequencyMaxElement); - if (PeriodElement != null) yield return new ElementValue("period", PeriodElement); - if (PeriodMaxElement != null) yield return new ElementValue("periodMax", PeriodMaxElement); - if (PeriodUnitElement != null) yield return new ElementValue("periodUnit", PeriodUnitElement); - foreach (var elem in DayOfWeekElement) { if (elem != null) yield return new ElementValue("dayOfWeek", elem); } - foreach (var elem in TimeOfDayElement) { if (elem != null) yield return new ElementValue("timeOfDay", elem); } - foreach (var elem in WhenElement) { if (elem != null) yield return new ElementValue("when", elem); } - if (OffsetElement != null) yield return new ElementValue("offset", OffsetElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -903,7 +855,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -958,7 +910,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Bounds is not null) yield return new KeyValuePair("bounds",Bounds); @@ -1087,31 +1039,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in EventElement) { if (elem != null) yield return elem; } - if (Repeat != null) yield return Repeat; - if (Code != null) yield return Code; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in EventElement) { if (elem != null) yield return new ElementValue("event", elem); } - if (Repeat != null) yield return new ElementValue("repeat", Repeat); - if (Code != null) yield return new ElementValue("code", Code); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1130,7 +1058,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1149,7 +1077,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (EventElement?.Any() == true) yield return new KeyValuePair("event",EventElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/TriggerDefinition.cs b/src/Hl7.Fhir.STU3/Model/Generated/TriggerDefinition.cs index 9e5cd35922..ab6e4cc029 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/TriggerDefinition.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/TriggerDefinition.cs @@ -256,33 +256,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (TypeElement != null) yield return TypeElement; - if (EventNameElement != null) yield return EventNameElement; - if (EventTiming != null) yield return EventTiming; - if (EventData != null) yield return EventData; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (TypeElement != null) yield return new ElementValue("type", TypeElement); - if (EventNameElement != null) yield return new ElementValue("eventName", EventNameElement); - if (EventTiming != null) yield return new ElementValue("eventTiming", EventTiming); - if (EventData != null) yield return new ElementValue("eventData", EventData); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -304,7 +278,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -326,7 +300,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (TypeElement is not null) yield return new KeyValuePair("type",TypeElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs b/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs index f716e3b478..27e47e3cdb 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/ValueSet.cs @@ -216,33 +216,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LockedDateElement != null) yield return LockedDateElement; - if (InactiveElement != null) yield return InactiveElement; - foreach (var elem in Include) { if (elem != null) yield return elem; } - foreach (var elem in Exclude) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LockedDateElement != null) yield return new ElementValue("lockedDate", LockedDateElement); - if (InactiveElement != null) yield return new ElementValue("inactive", InactiveElement); - foreach (var elem in Include) { if (elem != null) yield return new ElementValue("include", elem); } - foreach (var elem in Exclude) { if (elem != null) yield return new ElementValue("exclude", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -264,7 +238,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -286,7 +260,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LockedDateElement is not null) yield return new KeyValuePair("lockedDate",LockedDateElement); @@ -489,35 +463,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemElement != null) yield return SystemElement; - if (VersionElement != null) yield return VersionElement; - foreach (var elem in Concept) { if (elem != null) yield return elem; } - foreach (var elem in Filter) { if (elem != null) yield return elem; } - foreach (var elem in ValueSetElement) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - foreach (var elem in Concept) { if (elem != null) yield return new ElementValue("concept", elem); } - foreach (var elem in Filter) { if (elem != null) yield return new ElementValue("filter", elem); } - foreach (var elem in ValueSetElement) { if (elem != null) yield return new ElementValue("valueSet", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -542,7 +488,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -567,7 +513,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemElement is not null) yield return new KeyValuePair("system",SystemElement); @@ -721,31 +667,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - foreach (var elem in Designation) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - foreach (var elem in Designation) { if (elem != null) yield return new ElementValue("designation", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -764,7 +686,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -783,7 +705,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (CodeElement is not null) yield return new KeyValuePair("code",CodeElement); @@ -935,31 +857,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (LanguageElement != null) yield return LanguageElement; - if (Use != null) yield return Use; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (LanguageElement != null) yield return new ElementValue("language", LanguageElement); - if (Use != null) yield return new ElementValue("use", Use); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -978,7 +876,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -997,7 +895,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (LanguageElement is not null) yield return new KeyValuePair("language",LanguageElement); @@ -1170,31 +1068,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (PropertyElement != null) yield return PropertyElement; - if (OpElement != null) yield return OpElement; - if (ValueElement != null) yield return ValueElement; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (PropertyElement != null) yield return new ElementValue("property", PropertyElement); - if (OpElement != null) yield return new ElementValue("op", OpElement); - if (ValueElement != null) yield return new ElementValue("value", ValueElement); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1213,7 +1087,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1232,7 +1106,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (PropertyElement is not null) yield return new KeyValuePair("property",PropertyElement); @@ -1470,37 +1344,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (IdentifierElement != null) yield return IdentifierElement; - if (TimestampElement != null) yield return TimestampElement; - if (TotalElement != null) yield return TotalElement; - if (OffsetElement != null) yield return OffsetElement; - foreach (var elem in Parameter) { if (elem != null) yield return elem; } - foreach (var elem in Contains) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (IdentifierElement != null) yield return new ElementValue("identifier", IdentifierElement); - if (TimestampElement != null) yield return new ElementValue("timestamp", TimestampElement); - if (TotalElement != null) yield return new ElementValue("total", TotalElement); - if (OffsetElement != null) yield return new ElementValue("offset", OffsetElement); - foreach (var elem in Parameter) { if (elem != null) yield return new ElementValue("parameter", elem); } - foreach (var elem in Contains) { if (elem != null) yield return new ElementValue("contains", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1528,7 +1372,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1556,7 +1400,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (IdentifierElement is not null) yield return new KeyValuePair("identifier",IdentifierElement); @@ -1678,29 +1522,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (NameElement != null) yield return NameElement; - if (Value != null) yield return Value; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (Value != null) yield return new ElementValue("value", Value); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1716,7 +1538,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1732,7 +1554,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (NameElement is not null) yield return new KeyValuePair("name",NameElement); @@ -2034,41 +1856,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (SystemElement != null) yield return SystemElement; - if (AbstractElement != null) yield return AbstractElement; - if (InactiveElement != null) yield return InactiveElement; - if (VersionElement != null) yield return VersionElement; - if (CodeElement != null) yield return CodeElement; - if (DisplayElement != null) yield return DisplayElement; - foreach (var elem in Designation) { if (elem != null) yield return elem; } - foreach (var elem in Contains) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (SystemElement != null) yield return new ElementValue("system", SystemElement); - if (AbstractElement != null) yield return new ElementValue("abstract", AbstractElement); - if (InactiveElement != null) yield return new ElementValue("inactive", InactiveElement); - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (CodeElement != null) yield return new ElementValue("code", CodeElement); - if (DisplayElement != null) yield return new ElementValue("display", DisplayElement); - foreach (var elem in Designation) { if (elem != null) yield return new ElementValue("designation", elem); } - foreach (var elem in Contains) { if (elem != null) yield return new ElementValue("contains", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2102,7 +1890,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2136,7 +1924,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (SystemElement is not null) yield return new KeyValuePair("system",SystemElement); @@ -2738,63 +2526,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (UrlElement != null) yield return UrlElement; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (VersionElement != null) yield return VersionElement; - if (NameElement != null) yield return NameElement; - if (TitleElement != null) yield return TitleElement; - if (StatusElement != null) yield return StatusElement; - if (ExperimentalElement != null) yield return ExperimentalElement; - if (DateElement != null) yield return DateElement; - if (PublisherElement != null) yield return PublisherElement; - foreach (var elem in Contact) { if (elem != null) yield return elem; } - if (DescriptionElement != null) yield return DescriptionElement; - foreach (var elem in UseContext) { if (elem != null) yield return elem; } - foreach (var elem in Jurisdiction) { if (elem != null) yield return elem; } - if (ImmutableElement != null) yield return ImmutableElement; - if (PurposeElement != null) yield return PurposeElement; - if (CopyrightElement != null) yield return CopyrightElement; - if (ExtensibleElement != null) yield return ExtensibleElement; - if (Compose != null) yield return Compose; - if (Expansion != null) yield return Expansion; - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (UrlElement != null) yield return new ElementValue("url", UrlElement); - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (VersionElement != null) yield return new ElementValue("version", VersionElement); - if (NameElement != null) yield return new ElementValue("name", NameElement); - if (TitleElement != null) yield return new ElementValue("title", TitleElement); - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (ExperimentalElement != null) yield return new ElementValue("experimental", ExperimentalElement); - if (DateElement != null) yield return new ElementValue("date", DateElement); - if (PublisherElement != null) yield return new ElementValue("publisher", PublisherElement); - foreach (var elem in Contact) { if (elem != null) yield return new ElementValue("contact", elem); } - if (DescriptionElement != null) yield return new ElementValue("description", DescriptionElement); - foreach (var elem in UseContext) { if (elem != null) yield return new ElementValue("useContext", elem); } - foreach (var elem in Jurisdiction) { if (elem != null) yield return new ElementValue("jurisdiction", elem); } - if (ImmutableElement != null) yield return new ElementValue("immutable", ImmutableElement); - if (PurposeElement != null) yield return new ElementValue("purpose", PurposeElement); - if (CopyrightElement != null) yield return new ElementValue("copyright", CopyrightElement); - if (ExtensibleElement != null) yield return new ElementValue("extensible", ExtensibleElement); - if (Compose != null) yield return new ElementValue("compose", Compose); - if (Expansion != null) yield return new ElementValue("expansion", Expansion); - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -2861,7 +2593,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -2928,7 +2660,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (UrlElement is not null) yield return new KeyValuePair("url",UrlElement); diff --git a/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs b/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs index 46ca88afef..d6345d6fe2 100644 --- a/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs +++ b/src/Hl7.Fhir.STU3/Model/Generated/VisionPrescription.cs @@ -632,55 +632,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - if (Product != null) yield return Product; - if (EyeElement != null) yield return EyeElement; - if (SphereElement != null) yield return SphereElement; - if (CylinderElement != null) yield return CylinderElement; - if (AxisElement != null) yield return AxisElement; - if (PrismElement != null) yield return PrismElement; - if (BaseElement != null) yield return BaseElement; - if (AddElement != null) yield return AddElement; - if (PowerElement != null) yield return PowerElement; - if (BackCurveElement != null) yield return BackCurveElement; - if (DiameterElement != null) yield return DiameterElement; - if (Duration != null) yield return Duration; - if (ColorElement != null) yield return ColorElement; - if (BrandElement != null) yield return BrandElement; - foreach (var elem in Note) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - if (Product != null) yield return new ElementValue("product", Product); - if (EyeElement != null) yield return new ElementValue("eye", EyeElement); - if (SphereElement != null) yield return new ElementValue("sphere", SphereElement); - if (CylinderElement != null) yield return new ElementValue("cylinder", CylinderElement); - if (AxisElement != null) yield return new ElementValue("axis", AxisElement); - if (PrismElement != null) yield return new ElementValue("prism", PrismElement); - if (BaseElement != null) yield return new ElementValue("base", BaseElement); - if (AddElement != null) yield return new ElementValue("add", AddElement); - if (PowerElement != null) yield return new ElementValue("power", PowerElement); - if (BackCurveElement != null) yield return new ElementValue("backCurve", BackCurveElement); - if (DiameterElement != null) yield return new ElementValue("diameter", DiameterElement); - if (Duration != null) yield return new ElementValue("duration", Duration); - if (ColorElement != null) yield return new ElementValue("color", ColorElement); - if (BrandElement != null) yield return new ElementValue("brand", BrandElement); - foreach (var elem in Note) { if (elem != null) yield return new ElementValue("note", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -735,7 +687,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -790,7 +742,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Product is not null) yield return new KeyValuePair("product",Product); @@ -1030,41 +982,7 @@ public override bool IsExactly(IDeepComparable other) return true; } - [IgnoreDataMember] - public override IEnumerable Children - { - get - { - foreach (var item in base.Children) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return elem; } - if (StatusElement != null) yield return StatusElement; - if (Patient != null) yield return Patient; - if (Encounter != null) yield return Encounter; - if (DateWrittenElement != null) yield return DateWrittenElement; - if (Prescriber != null) yield return Prescriber; - if (Reason != null) yield return Reason; - foreach (var elem in Dispense) { if (elem != null) yield return elem; } - } - } - - [IgnoreDataMember] - public override IEnumerable NamedChildren - { - get - { - foreach (var item in base.NamedChildren) yield return item; - foreach (var elem in Identifier) { if (elem != null) yield return new ElementValue("identifier", elem); } - if (StatusElement != null) yield return new ElementValue("status", StatusElement); - if (Patient != null) yield return new ElementValue("patient", Patient); - if (Encounter != null) yield return new ElementValue("encounter", Encounter); - if (DateWrittenElement != null) yield return new ElementValue("dateWritten", DateWrittenElement); - if (Prescriber != null) yield return new ElementValue("prescriber", Prescriber); - if (Reason != null) yield return new ElementValue("reason", Reason); - foreach (var elem in Dispense) { if (elem != null) yield return new ElementValue("dispense", elem); } - } - } - - protected override bool TryGetValue(string key, out object value) + internal protected override bool TryGetValue(string key, out object value) { switch (key) { @@ -1098,7 +1016,7 @@ protected override bool TryGetValue(string key, out object value) } - protected override Base SetValue(string key, object value) + internal protected override Base SetValue(string key, object value) { switch (key) { @@ -1132,7 +1050,7 @@ protected override Base SetValue(string key, object value) } - protected override IEnumerable> GetElementPairs() + internal protected override IEnumerable> GetElementPairs() { foreach (var kvp in base.GetElementPairs()) yield return kvp; if (Identifier?.Any() == true) yield return new KeyValuePair("identifier",Identifier); diff --git a/src/Hl7.Fhir.STU3/Specification/Snapshot/ElementIdGenerator.cs b/src/Hl7.Fhir.STU3/Specification/Snapshot/ElementIdGenerator.cs deleted file mode 100644 index 61c79493fe..0000000000 --- a/src/Hl7.Fhir.STU3/Specification/Snapshot/ElementIdGenerator.cs +++ /dev/null @@ -1,359 +0,0 @@ -/* - * Copyright (c) 2017, Firely (info@fire.ly) and contributors - * See the file CONTRIBUTORS for details. - * - * This file is licensed under the BSD 3-Clause license - * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE - */ - -using Hl7.Fhir.Model; -using Hl7.Fhir.Specification.Navigation; -using Hl7.Fhir.Utility; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; - -namespace Hl7.Fhir.Specification.Snapshot -{ - // [WMR 20160917] STU3: (re-)generate ElementId values - // http://hl7.org/fhir/STU3/elementdefinition.html#id - - // [WMR 20170614] TODO - // - Generate normalized ID for type slices of the form [originalElementName]:[sliceName] - // Tooling convention: initialize sliceName with renamed element, e.g. "valueString" - // Example: Patient.deceased[x]:deceasedBoolean - // - Maintain any existing element IDs in differential - // But generate canonical IDs for child elements without explicit user IDs - // Example: Patient.identifier:ssn : ID = "PatientSsnId" (overridden) - // => Patient.identifier:ssn.system : ID = "Patient.identifier:ssn.system" (NOT "PatientSsnId.system") - // - Expose public utility functions to - // * Generate element id segment from element name and slice name - // * Verify if an element id has the canonical form - - // Syntax: [path[:name][.path[:name]...]] - // - Element.ElementId has the exact same number of components as Element.Path - // - Components are separated by the dot character "." - // - First part of each component equals the local path component, i.e. the FHIR element name - // - Second optional part of each component equals the slice name, if not empty, separated by a semi-colon ":" - // Notes: - // - slice name may not contain dot characters "." ! - // - for re-slicing, the slice name can be of the form "OrignalSlice/Reslice" - // - DSTU2: id has regex [A-Za-z0-9\-\.]{1,64} => cannot use proposed id scheme - - /// Represents a segment of an element Id, derived from the (original) element name and the (optional) slice name. - public struct ElementIdSegment - { - /// Represents an empty segment. - public static readonly ElementIdSegment Empty = new ElementIdSegment(null, null); - - /// Create a new from the specified (original) element name and (optional) slice name. - public static ElementIdSegment Create(string elementName, string sliceName = null) - { - if (string.IsNullOrEmpty(elementName)) { throw Error.ArgumentNull(nameof(elementName)); } - return new ElementIdSegment(elementName, sliceName); - } - - /// Create a new from the specified element definition. - public static ElementIdSegment Create(ElementDefinition elemDef) => new ElementIdSegment(elemDef); - - /// - /// Create a new by parsing the specified id segment string of the form "elementName[:sliceName]". - /// - public static ElementIdSegment Parse(string idSegment) - { - if (string.IsNullOrEmpty(idSegment)) { throw Error.ArgumentNull(nameof(idSegment)); } - if (idSegment.IndexOf(ElementIdGenerator.ElementIdSegmentDelimiter) > -1) { throw Error.Argument(nameof(idSegment), $"The specified element id segment is invalid. A segment cannot contain the segment delimiter character '{ElementIdGenerator.ElementIdSegmentDelimiter}'."); } - - var pos = idSegment.IndexOf(ElementIdGenerator.ElementIdSliceNameDelimiter); - if (pos == -1) { return new ElementIdSegment(idSegment); } - return new ElementIdSegment(idSegment.Substring(0, pos), idSegment.Substring(pos + 1)); - } - - /// Parse the specified element id into a sequence of s. - public static IEnumerable ParseId(string elementId) - { - if (string.IsNullOrEmpty(elementId)) { throw Error.ArgumentNull(nameof(elementId)); } - var segments = ElementIdGenerator.ParseId(elementId); - return segments.Select(s => ElementIdSegment.Parse(s)); - } - - ElementIdSegment(string elementName, string sliceName = null) - { - ElementName = elementName; - SliceName = sliceName; - } - - ElementIdSegment(ElementDefinition elemDef) - { - elemDef.ThrowIfNullOrEmptyPath(nameof(elemDef)); - - var basePath = elemDef.Base?.Path; - var elemPath = basePath != null && ElementDefinitionNavigator.IsChoiceTypeElement(basePath) ? basePath : elemDef.Path; - ElementName = ProfileNavigationExtensions.GetNameFromPath(elemPath); - SliceName = elemDef.SliceName; - } - - /// Returns the (original) element name. - public readonly string ElementName; - - /// Returns the (optional) slice name, or null. - public readonly string SliceName; - - /// Determines if this instance represents an empty segment, i.e. if the equals null. - public bool IsEmpty => ElementName == null; - - /// Returns a formatted element id segment of the form "ElementName[:SliceName]". - public override string ToString() - { - return string.IsNullOrEmpty(SliceName) - ? ElementName - : ElementName + ElementIdGenerator.ElementIdSliceNameDelimiter + SliceName; - } - } - - /// For generating unique element IDs according to the standardized default format. - public static class ElementIdGenerator - { - #region Public interface - - /// Delimiter inbetween segments of an element id. - public const char ElementIdSegmentDelimiter = '.'; - - /// Delimiter inbetween path segment and (optional) element slice name. - public const char ElementIdSliceNameDelimiter = ':'; - - /// - /// Generate an element ID segment for the specified - /// by concatenating the (original) element name and the slice name (if not empty). - /// For choice type elements, the element ID segment is always generated from the original - /// element name (ending with "[x]") as specified by , - /// concatenated with the sliceName, which by convention should be initialized to the renamed element name. - /// - /// A string that represents an element id segment of the form "elementName[:sliceName]". - /// To generate the full element id, traverse the element hierarchy and concatenate the associated element id segments. - /// value[x]:valueString - public static string GenerateIdSegment(ElementDefinition elemDef) => ElementIdSegment.Create(elemDef).ToString(); - - /// Generate a segment of a standardized element ID from the specified element path and slice name. - /// A string that represents an standardized element id segment of the form "elementName[:sliceName]". - public static string GenerateIdSegment(string elementPath, string sliceName) - { - var elementName = ProfileNavigationExtensions.GetNameFromPath(elementPath); - return ElementIdSegment.Create(elementName, sliceName).ToString(); - } - - /// Parse a standardized element id into an array of segments of the form "elementName[:sliceName]". - /// An element id. - /// An array of element id segments of the form "elementName[:sliceName]". - public static string[] ParseId(string elementId) - { - if (elementId == null) { throw Error.ArgumentNull(nameof(elementId)); } - return elementId.Split(ElementIdSegmentDelimiter); - } - - /// Generate a standard element ID for the specified instance. - /// An instance. - /// The (generated) element id of the associated parent element, or null. - /// A string that represents the full element ID. - public static string GenerateId(ElementDefinition elemDef, string parentElementId) - { - // GenerateIdSegment method will verify the elemDef argument - var idSegment = GenerateIdSegment(elemDef); - - return !string.IsNullOrEmpty(parentElementId) - ? parentElementId + ElementIdSegmentDelimiter + idSegment - : idSegment; - } - - /// - /// Generate a standard element ID for the current element of the specified - /// instance, by recursively traversing all the (grand)parent elements. - /// - /// A string that represents the full element ID. - public static string GenerateId(ElementDefinitionNavigator nav) - { - nav.ThrowIfNullOrNotPositioned(nameof(nav)); - - var bm = nav.Bookmark(); - string parentId = ""; - if (nav.MoveToParent()) - { - if (!nav.AtRoot) { parentId = GenerateId(nav); } - nav.ReturnToBookmark(bm); - } - return GenerateId(nav.Current, parentId); - } - - /// - /// Generate and assign standard element IDs to the current element of the specified - /// instance and it's children, recursively. - /// - /// An instance. - /// Determines wether to regenerate (true) or maintain (false) any existing element IDs. - /// Determines wether to only update child element ids (true) or also update the id of the current element (false). - public static void Update(ElementDefinitionNavigator nav, bool force = false, bool onlyChildren = false) - { - var bm = nav.Bookmark(); - - var parentId = ""; - if (onlyChildren) - { - // Note: cannot rely on nav.Current.ElementId as it may represent a custom id value - // Instead, always recalculate full parent id - if (!nav.AtRoot) - { - parentId = GenerateId(nav); - } - if (nav.MoveToFirstChild()) - { - generate(nav, parentId, force); - nav.ReturnToBookmark(bm); - } - } - else - { - if (nav.MoveToParent()) - { - // Parent may have a custom element Id value - // => must always (re-)generate full id by traversing parent hierarchy - // Possible optimization: caller could specify parent id - if (!nav.AtRoot) - { - parentId = GenerateId(nav); - } - nav.ReturnToBookmark(bm); - } - generate(nav, parentId, force); - nav.ReturnToBookmark(bm); - } - } - - /// - /// Generate and assign unique element IDs in standardized default format - /// for all the items in the snapshot - /// component of the specified instance. - /// - /// A instance. - /// Determines wether to regenerate (true) or maintain (false) any existing element IDs. - public static void Update(StructureDefinition structure, bool force = false) - { - structure.ThrowIfNullOrNoSnapshot(nameof(structure)); - - Update(structure.Snapshot.Element, force); - } - - /// - /// Generate and assign unique element IDs in standardized default format - /// for a list of instances. - /// - /// A list of s. - /// Determines wether to regenerate (true) or maintain (false) any existing element IDs. - public static void Update(IList elements, bool force = false) - { - if (elements == null) { throw new ArgumentNullException(nameof(elements)); } - - var nav = new ElementDefinitionNavigator(elements); - if (nav.MoveToFirstChild()) - { - generate(nav, "", force); - } - } - - /// Clear all the existing element IDs in the snapshot component. - public static void Clear(StructureDefinition structure) - { - structure.ThrowIfNullOrNoSnapshot(nameof(structure)); - - Clear(structure.Snapshot.Element); - } - - /// Clear all the existing element IDs. - /// A list of instances. - public static void Clear(IList elements) - { - if (elements == null) { throw new ArgumentNullException(nameof(elements)); } - - foreach (var elem in elements) - { - elem.ElementId = null; - } - } - - /// Clear the element IDs of the current element and it's children, recursively. - /// An instance that is positioned on a specific element. - /// Determines wether to only clear child element ids (true) or also clear the id of the current element (false). - public static void Clear(ElementDefinitionNavigator nav, bool onlyChildren) - { - nav.ThrowIfNullOrNotPositioned(nameof(nav)); - if (onlyChildren) - { - clearChildren(nav); - } - else - { - clear(nav); - } - } - - static void clear(ElementDefinitionNavigator nav) - { - nav.Current.ElementId = null; - clearChildren(nav); - } - - static void clearChildren(ElementDefinitionNavigator nav) - { - var bm = nav.Bookmark(); - if (nav.MoveToFirstChild()) - { - do - { - clear(nav); - } while (nav.MoveToNext()); - nav.ReturnToBookmark(bm); - } - } - - #endregion - - #region Private interface - - static void generate(ElementDefinitionNavigator nav, string parentElemId, bool force) - { - nav.ThrowIfNullOrNotPositioned(nameof(nav)); - - do - { - var id = generate(nav.Current, parentElemId, force); - var bm = nav.Bookmark(); - if (nav.MoveToFirstChild()) - { - // Recurse child elements - generate(nav, id, force); - nav.ReturnToBookmark(bm); - } - } while (nav.MoveToNext()); - } - - static string generate(ElementDefinition elemDef, string parentElemId, bool force) - { - elemDef.ThrowIfNullOrEmptyPath(nameof(elemDef)); - - var id = GenerateId(elemDef, parentElemId); - - // Don't replace existing IDs, unless force = true - if (force || elemDef.ElementId == null) - { - // Debug.WriteLine($"[{nameof(ElementIdGenerator)}.{nameof(generate)}] Path: {elemDef.Path}:{elemDef.SliceName} Id: {elemDef.ElementId} => {id}"); - elemDef.ElementId = id; - } - - // Always return the generated ID value, as prefix for child element IDs - return id; - } - - #endregion - - } -} diff --git a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorAnnotations.cs b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorAnnotations.cs deleted file mode 100644 index be4257bf0e..0000000000 --- a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorAnnotations.cs +++ /dev/null @@ -1,235 +0,0 @@ -/* - * Copyright (c) 2017, Firely (info@fire.ly) and contributors - * See the file CONTRIBUTORS for details. - * - * This file is licensed under the BSD 3-Clause license - * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE - */ - -#define DEBUG_SNAP_ELEM_ANNOTATIONS - -using Hl7.Fhir.Model; -using Hl7.Fhir.Utility; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; - -namespace Hl7.Fhir.Specification.Snapshot -{ - /// Provides support for custom annotation types used by the . - public static class SnapshotGeneratorAnnotations - { - #region Annotation: Created By Snapshot Generator - - /// Annotation to mark a generated element, so we can prevent duplicate re-generation. - [Serializable] - sealed class CreatedBySnapshotGeneratorAnnotation - { - public DateTimeOffset Created { get; } - public CreatedBySnapshotGeneratorAnnotation() { Created = DateTimeOffset.UtcNow; } - } - - /// Marks the specified element as generated by the . - internal static void SetCreatedBySnapshotGenerator(this Element elem) { elem?.AddAnnotation(new CreatedBySnapshotGeneratorAnnotation()); } - - /// Determines if the specified element was created by the . - /// A FHIR . - /// true if the element was created by the , or false otherwise. - public static bool IsCreatedBySnapshotGenerator(this Element elem) => elem != null && elem.HasAnnotation(); - - #endregion - - #region Annotation: Differential Constraint - - /// - /// Custom annotation for elements and properties in the - /// that are constrained by the . - /// - [Serializable] - sealed class ConstrainedByDiffAnnotation - { - // - } - - /// Annotate the specified snapshot element to indicate that it is constrained by the differential. - internal static void SetConstrainedByDiffAnnotation(this Base element) - { - if (element == null) { throw Error.ArgumentNull(nameof(element)); } - element.AddAnnotation(new ConstrainedByDiffAnnotation()); - } - - /// Remove any existing differential constraint annotation from the specified snapshot element. - internal static void RemoveConstrainedByDiffAnnotation(this Base element) - { - if (element == null) { throw Error.ArgumentNull(nameof(element)); } - element.RemoveAnnotations(); - } - - /// Recursively remove any existing differential constraint annotations from the specified snapshot element and all it's children. - internal static void RemoveAllConstrainedByDiffAnnotations(this Base element) - { - if (element == null) { throw Error.ArgumentNull(nameof(element)); } - element.RemoveConstrainedByDiffAnnotation(); - foreach (var child in element.Children) - { - child.RemoveAllConstrainedByDiffAnnotations(); - } - } - - /// Recursively remove any existing differential constraint annotations from the specified snapshot elements and all their children. - internal static void RemoveAllConstrainedByDiffAnnotations(this IEnumerable elements) where T : Base - { - if (elements == null) { throw Error.ArgumentNull(nameof(elements)); } - foreach (var elem in elements) - { - elem.RemoveAllConstrainedByDiffAnnotations(); - } - } - - /// - /// Determines if the specified element is annotated as being constrained by the differential. - /// Note that this method is non-recursive; only the specified element itself is inspected, child element annotations are ignored. - /// Use to perform a recursive check. - /// - public static bool IsConstrainedByDiff(this Base elem) => elem != null && elem.HasAnnotation(); - - /// Determines if the specified element or any of it's children is annotated as being constrained by the differential. - public static bool HasDiffConstraintAnnotations(this Base elem) - => elem != null && ( - elem.HasAnnotation() - || elem.Children.Any(e => e.HasDiffConstraintAnnotations()) - ); - - #endregion - - - #region Annotation: Snapshot ElementDefinition - - // [WMR 20190806] Special internal annotation to save temporary reference to generated snapshot (root) element - // Used for handling recursive profiles, e.g. Element & Extension - // 1. Generate the new snapshot root element - // 2. Temporarily annotate original diff root element with reference to generated snapshot root - // 3. Generate the remaining snapshot elements - // 4. When having to resolve a recursive reference to currently generated snapshot, - // retrieve the generated snapshot root element from the annotation, for merging - // e.g. Element.id => Element, Extension.extension => Extension - // 5. Finally, remove temporary annotation from diff root element before returning result to caller - // Annotation class is internal; must explicitly clean up all instances ourselves - // WARNING: DeepCopy() also copies annotations, take care... - - /// For annotating a differential element definition with a reference to the associated generated snapshot element definition. - [Serializable] - sealed class SnapshotElementDefinitionAnnotation - { - /// - /// Custom annotation type for instances in the component. - /// Returns a reference to the associated instance in the component. - /// - public ElementDefinition SnapshotElement { get; } - - public SnapshotElementDefinitionAnnotation(ElementDefinition snapshotElement -#if DEBUG_SNAP_ELEM_ANNOTATIONS - , ElementDefinition diffElement -#endif - ) - { - if (snapshotElement is null) { throw Error.ArgumentNull(nameof(snapshotElement)); } - SnapshotElement = snapshotElement; - -#if DEBUG_SNAP_ELEM_ANNOTATIONS - if (diffElement is null) { throw Error.ArgumentNull(nameof(diffElement)); } - DiffElement = diffElement; -#endif - } - -#if DEBUG_SNAP_ELEM_ANNOTATIONS - // [WMR 20190806] Custom property for detecting annotations on cloned elements - - /// - /// DEBUGGING - /// Returns a reference to the original parent that owns the annotation. - /// Should be equal to the actual owner. - /// Otherwise, indicates that the element has been cloned (with annotations). - /// - public ElementDefinition DiffElement { get; } -#endif - } - - /// - /// Annotate the root instance in the component - /// with a reference to the associated root instance in the component. - /// - internal static void SetSnapshotRootElementAnnotation(this StructureDefinition sd, ElementDefinition rootElemDef) - { - sd?.Differential?.Element[0]?.SetSnapshotElementAnnotation(rootElemDef); - } - - /// - /// Annotate the specified instance in the component - /// with a reference to the associated instance in the component. - /// - /// - /// - static void SetSnapshotElementAnnotation(this ElementDefinition diffElemDef, ElementDefinition snapElemDef) - { -#if DEBUG_SNAP_ELEM_ANNOTATIONS - Debug.WriteLine($"[{nameof(SnapshotGeneratorAnnotations)}.{nameof(SetSnapshotElementAnnotation)}] #{diffElemDef.GetHashCode()}"); -#endif - diffElemDef?.SetAnnotation(new SnapshotElementDefinitionAnnotation(snapElemDef -#if DEBUG_SNAP_ELEM_ANNOTATIONS - , diffElemDef -#endif - )); - } - - /// - /// Return the annotated reference to the associated root instance - /// in the component, if it exists, or null otherwise. - /// - internal static ElementDefinition GetSnapshotRootElementAnnotation(this StructureDefinition sd) - => sd?.Differential?.Element[0]?.GetSnapshotElementAnnotation(); - - /// - /// Return the annotated reference to the associated instance - /// in the component, if it exists, or null otherwise. - /// - internal static ElementDefinition GetSnapshotElementAnnotation(this ElementDefinition ed) -#if DEBUG_SNAP_ELEM_ANNOTATIONS - { - var ann = ed?.Annotation(); - - // If the element has been cloned, the annotation no longer applies - if (!(ann is null)) - { - if (object.ReferenceEquals(ed, ann.DiffElement)) - { - return ann.SnapshotElement; - } - Debug.WriteLine($"[{nameof(SnapshotGeneratorAnnotations)}.{nameof(GetSnapshotElementAnnotation)}] Detected cloned annotation, removing..."); - ed?.RemoveSnapshotElementAnnotations(); - } - return null; - } - - /// - /// DEBUGGING - /// Indicates if the specified is annotated - /// with a reference to the associated snapshot element definition. - /// - internal static bool HasSnapshotElementAnnotation(this ElementDefinition ed) - => !(ed?.Annotation() is null); -#else - => ed?.Annotation()?.SnapshotElement; -#endif - - /// Remove all instances from the root . - internal static void RemoveSnapshotRootElementAnnotation(this StructureDefinition sd) => sd?.Differential?.Element[0]?.RemoveSnapshotElementAnnotations(); - - /// Remove all instances from the specified . - internal static void RemoveSnapshotElementAnnotations(this ElementDefinition ed) { ed?.RemoveAnnotations(); } - - #endregion - - } -} diff --git a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorErrors.cs b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorErrors.cs deleted file mode 100644 index 3af046aa92..0000000000 --- a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorErrors.cs +++ /dev/null @@ -1,45 +0,0 @@ -using Hl7.Fhir.Model; -using Hl7.Fhir.Specification.Navigation; -using Hl7.Fhir.Utility; -using System; - -namespace Hl7.Fhir.Specification.Snapshot -{ - internal static class SnapshotGeneratorErrors - { - public const string Error_Navigator_Position = "Error! The specified element definition navigator is not positioned on an element."; - public const string Error_ElementDefinition_Path = "Error! The specified element definition has no path."; - public const string Error_StructureDefinition_Snapshot = "Error! The specified structure definition has no snapshot."; - - /// - /// Throw a runtime exception if the specified instance - /// is null or if it is not positioned on an element. - /// - public static void ThrowIfNullOrNotPositioned(this ElementDefinitionNavigator nav, string paramName) - { - if (nav == null) { throw Error.ArgumentNull(nameof(nav)); } - if (nav.AtRoot) { throw Error.Argument(nameof(nav), Error_Navigator_Position); } - } - - /// - /// Throw a runtime exception if the specified instance is null, - /// or if the property is null or empty. - /// - public static void ThrowIfNullOrEmptyPath(this ElementDefinition elemDef, string paramName) - { - if (elemDef == null) { throw Error.ArgumentNull(paramName); } - if (string.IsNullOrEmpty(elemDef.Path)) { throw Error.Argument(paramName, Error_ElementDefinition_Path); } - } - - /// - /// Throw a runtime exception if the specified instance is null, - /// or if the component is null or empty. - /// - public static void ThrowIfNullOrNoSnapshot(this StructureDefinition structDef, string paramName) - { - if (structDef == null) { throw Error.ArgumentNull(paramName); } - if (!structDef.HasSnapshot) { throw Error.Argument(paramName, Error_StructureDefinition_Snapshot); } - } - - } -} diff --git a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorEvents.cs b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorEvents.cs deleted file mode 100644 index def29b926c..0000000000 --- a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotGeneratorEvents.cs +++ /dev/null @@ -1,209 +0,0 @@ -/* - * Copyright (c) 2017, Firely (info@fire.ly) and contributors - * See the file CONTRIBUTORS for details. - * - * This file is licensed under the BSD 3-Clause license - * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE - */ - -using System; -using Hl7.Fhir.Model; - -namespace Hl7.Fhir.Specification.Snapshot -{ - // Event declarations for the SnapshotGenerator class - - public partial class SnapshotGenerator - { - /// - /// An event that notifies clients when a differential constraint has been processed. - /// The specified instance is the result of merging the base - /// element with the associated differential constraint(s). - /// The event handler can inspect and optionally modify the element. - /// The result will be included in the snapshot. - /// - public event SnapshotConstraintHandler Constraint; - - /// Raise the event to notify the client that a differential constraint has been processed. - /// A reference to the snapshot element with merged differential constraints. - internal void OnConstraint(Element element) - { - if (element == null) { throw new ArgumentNullException(nameof(element)); } - - // Configurable default behavior: mark changed elements - // [WMR 20160915] Mark element as chaged - markChangedByDiff(element); - - var handler = Constraint; - if (handler != null) - { - var args = new SnapshotConstraintEventArgs(element); - handler(this, args); - } - } - - /// - /// An event that notifies clients when a base profile has been resolved. - /// - /// - /// The event argument returns a - /// reference to the original base profile instance as returned by the artifact source. - /// Modifications to this instance will affect the original cached artifact - /// and will be visible to other consumers of the artifact source. - /// - public event SnapshotBaseProfileHandler PrepareBaseProfile; - - /// - /// Raise the event to notify the client - /// when the associated base profile has been resolved and prepared for merging. - /// - /// A profile instance. - /// The associated base profile instance. - internal void OnPrepareBaseProfile(StructureDefinition profile, StructureDefinition baseProfile) - { - if (profile == null) { throw new ArgumentNullException(nameof(profile)); } - if (baseProfile == null) { throw new ArgumentNullException(nameof(baseProfile)); } - var handler = PrepareBaseProfile; - if (handler != null) - { - var args = new SnapshotBaseProfileEventArgs(profile, baseProfile); - handler(this, args); - } - } - - /// - /// An event that notifies clients when the generator initializes a new snapshot element. - /// The specified element is cloned from the base profile and the base path has been fixed. - /// The event handler can inspect and optionally modify the element. - /// After the event handler returns, the snapshot generator merges the associated - /// differential constraints, if they exist. - /// - public event SnapshotElementHandler PrepareElement; - - /// Raise the event to notify the client when an element definition is being prepared for merging. - internal void OnPrepareElement(ElementDefinition element, StructureDefinition baseStructure, ElementDefinition baseElement) - { - if (element == null) { throw new ArgumentNullException(nameof(element)); } - var handler = PrepareElement; - if (handler != null) - { - var args = new SnapshotElementEventArgs(element, baseStructure, baseElement); - handler(this, args); - } - } - - /// Indicates if the event has any active subscribers. - bool MustRaisePrepareElement => PrepareElement != null; - - // [WMR 20170105] NEW - - /// - /// An event that notifies clients when the snapshot generator must determine wether to expand a specific profile element. - /// The event handler can inspect and optionally modify the flag. - /// If the flag equals true, then the snapshot generator will expand the current element. - /// - public event SnapshotExpandElementHandler BeforeExpandElement; - - /// - /// Raise the event to notify the client when deciding wether to expand the current element. - /// The client can modify the value of the parameter to control expansion of specific elements. - /// Warning: recursively expanding all profile elements may cause infinite recursion! - /// - internal void OnBeforeExpandElement(ElementDefinition element, bool hasChildren, ref bool mustExpand) - { - if (element == null) { throw new ArgumentNullException(nameof(element)); } - - var handler = BeforeExpandElement; - if (handler != null) - { - var args = new SnapshotExpandElementEventArgs(element, hasChildren, mustExpand); - handler(this, args); - mustExpand = args.MustExpand; - } - } - } - - - /// Event arguments for the event delegate. - public sealed class SnapshotConstraintEventArgs : EventArgs - { - internal SnapshotConstraintEventArgs(Element element) : base() { Element = element; } - - /// Returns a reference to a constrained snapshot element definition or property. - public Element Element { get; } - } - - /// A delegate type for hooking up events. - public delegate void SnapshotConstraintHandler(object sender, SnapshotConstraintEventArgs e); - - - /// Event arguments for the event delegate. - public sealed class SnapshotBaseProfileEventArgs : EventArgs - { - internal SnapshotBaseProfileEventArgs(StructureDefinition profile, StructureDefinition baseProfile) : base() - { - Profile = profile; - BaseProfile = baseProfile; - } - - /// Returns a reference to a profile. - public StructureDefinition Profile { get; } - - /// Returns a reference to the associated base profile. - public StructureDefinition BaseProfile { get; } - - } - - /// A delegate type for hooking up events. - public delegate void SnapshotBaseProfileHandler(object sender, SnapshotBaseProfileEventArgs e); - - - /// Event arguments for the event delegate. - public sealed class SnapshotElementEventArgs : EventArgs - { - internal SnapshotElementEventArgs(ElementDefinition element, StructureDefinition baseStructure, ElementDefinition baseElement) : base() - { - Element = element; - BaseElement = baseElement; - BaseStructure = baseStructure; - } - - /// Returns a reference to an element definition. - public ElementDefinition Element { get; } - - /// Returns a reference to the associated base element definition. - public ElementDefinition BaseElement { get; } - - /// Returns a reference to the associated base structure definition. The snapshot component contains the instance. - public StructureDefinition BaseStructure { get; } - } - - /// A delegate type for hooking up events. - public delegate void SnapshotElementHandler(object sender, SnapshotElementEventArgs e); - - - /// Event arguments for the event delegate. - public sealed class SnapshotExpandElementEventArgs : EventArgs - { - internal SnapshotExpandElementEventArgs(ElementDefinition element, bool hasChildren, bool mustExpand) : base() - { - Element = element; - HasChildren = hasChildren; - MustExpand = mustExpand; - } - - /// Returns a reference to the current element. - public ElementDefinition Element { get; } - - /// Indicates wether the current element has any child elements. - public bool HasChildren { get; } - - /// Gets or sets a boolean value that determines wether the snapshot generator should expand children of the current element. - public bool MustExpand { get; set; } - } - - /// A delegate type for hooking up events. - public delegate void SnapshotExpandElementHandler(object sender, SnapshotExpandElementEventArgs e); - - -} diff --git a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotRecursionStack.cs b/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotRecursionStack.cs deleted file mode 100644 index 4d422c4580..0000000000 --- a/src/Hl7.Fhir.STU3/Specification/Snapshot/SnapshotRecursionStack.cs +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright (c) 2017, Firely (info@fire.ly) and contributors - * See the file CONTRIBUTORS for details. - * - * This file is licensed under the BSD 3-Clause license - * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE - */ - -using Hl7.Fhir.Specification.Navigation; -using Hl7.Fhir.Support; -using Hl7.Fhir.Utility; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.CompilerServices; - -namespace Hl7.Fhir.Specification.Snapshot -{ - /// Internal helper class to detect and prevent recursive snapshot generation. - sealed class SnapshotRecursionStack - { - Stack _stack; - - sealed class SnapshotRecursionStackState - { - public SnapshotRecursionStackState(string profileUri) - { - if (profileUri == null) { throw Error.ArgumentNull(nameof(profileUri)); } - ProfileUri = profileUri; - Navigator = null; - } - /// Canonical uri of a profile for which the snapshot is being generated. - public readonly string ProfileUri; - - /// - /// Reference to the that is generating the snapshot. - /// Allows access to already generated elements. - /// - public ElementDefinitionNavigator Navigator { get; internal set; } - } - - /// Initialize the recursion stack before generating a single snapshot element. - public void OnStartRecursion() - { - if (_stack != null) - { - throw Error.InvalidOperation($"Invalid snapshot generator state ({nameof(OnStartRecursion)}). Cannot start a new snapshot generation. The previous operation has not finished."); - } - _stack = new Stack(); - } - - /// Verify and clear the recursion stack after generating a single snapshot element. - public void OnFinishRecursion() - { - if (_stack == null) - { - throw Error.InvalidOperation($"Invalid snapshot generator state ({nameof(OnFinishRecursion)}). Cannot finish snapshot generation. No snapshot is currently being generated."); - } - if (_stack.Count > 0) - { - throw Error.InvalidOperation($"Invalid snapshot generator state ({nameof(OnFinishRecursion)}). Cannot finish the operation while snapshots are still being generated."); - } - _stack = null; - } - - /// Initialize the recursion stack before generating a full snapshot. - public void OnBeforeGenerateSnapshot(string profileUri) - { - // Debug.Print($"[{nameof(SnapshotRecursionStack)}.{nameof(OnBeforeGenerateSnapshot)}] '{profileUri}'"); - OnStartRecursion(); - _stack.Push(new SnapshotRecursionStackState(profileUri)); - } - - /// Verify and clear the recursion stack after generating a full snapshot. - public void OnAfterGenerateSnapshot(string profileUri) - { - validateStackIsNotEmpty(nameof(OnAfterGenerateSnapshot)); - var currentState = _stack.Pop(); - var currentProfileUri = currentState.ProfileUri; - // Debug.Print($"[{nameof(SnapshotRecursionStack)}.{nameof(OnAfterGenerateSnapshot)}] '{profileUri}'"); - if (profileUri != currentProfileUri) - { - throw Error.InvalidOperation($"Invalid snapshot generator state ({nameof(OnAfterGenerateSnapshot)}). The specified profile Uri '{profileUri}' does not match the current state: '{CurrentProfileUri}'"); - } - OnFinishRecursion(); - } - - /// Verify recursive snapshot generation of the external profile with the specified url. - /// Thrown when detecting recursive snapshot generation. - public void OnBeforeExpandTypeProfile(string typeProfileUri, string path) - { - if (IsGenerating(typeProfileUri)) - { - throw Error.NotSupported( - $"Error generating snapshot. Recursive profile dependency detected for profile '{typeProfileUri}' on element '{path}'.\r\nProfile url stack:\r\n{string.Join("\r\n", this)}" - ); - } - // Debug.Print($"[{nameof(SnapshotRecursionStack)}.{nameof(OnBeforeExpandTypeProfile)}] '{typeProfileUri}'"); - _stack.Push(new SnapshotRecursionStackState(typeProfileUri)); - - } - - /// Signal that recursive snapshot generation of an external profile has finished. - public void OnAfterExpandTypeProfile(string typeProfileUri, string path) - { - // Debug.Print($"[{nameof(SnapshotRecursionStack)}.{nameof(OnAfterExpandTypeProfile)}] '{typeProfileUri}'"); - validateStackIsNotEmpty(nameof(OnAfterExpandTypeProfile)); - var currentState = _stack.Pop(); - var currentProfileUri = currentState.ProfileUri; - if (currentProfileUri != typeProfileUri) - { - throw Error.InvalidOperation($"Invalid snapshot generator state ({nameof(OnAfterExpandTypeProfile)}). The profile url '{typeProfileUri}' of the completed snapshot does not match the current state '{currentProfileUri}'."); - } - - } - - /// Returns the uri of the profile for which the snapshot component is currently being generated, or null. - public string CurrentProfileUri => _stack.Count > 0 ? _stack.Peek().ProfileUri : null; - - public void RegisterSnapshotNavigator(string profileUri, ElementDefinitionNavigator navigator) - { - if (navigator == null) { throw Error.ArgumentNull(nameof(navigator)); } - validateStackIsNotEmpty(nameof(RegisterSnapshotNavigator)); - var state = _stack.Peek(); - if (state.ProfileUri != profileUri) - { - throw Error.InvalidOperation($"Invalid snapshot generator state ({nameof(RegisterSnapshotNavigator)}). The profile url '{profileUri}' of the completed snapshot does not match the current state '{state.ProfileUri}'."); - } - // Navigator reference is write-once - if (state.Navigator != null) { throw Error.InvalidOperation($"Invalid snapshot generator state ({nameof(RegisterSnapshotNavigator)}): The navigator for profile '{profileUri}' is already initialized."); } - state.Navigator = navigator; - } - - public ElementDefinitionNavigator ResolveSnapshotNavigator(string profileUri) - { - var match = _stack.FirstOrDefault(state => state.ProfileUri == profileUri); - return match?.Navigator; // Returns null for default state (no match) - } - - /// Determines if the snapshot of the profile with the specified uri is being generated. - public bool IsGenerating(string profileUri) => _stack.Any(state => state.ProfileUri == profileUri); - - public int RecursionDepth => _stack.Count; - - void validateStackIsNotEmpty([CallerMemberName] string memberName = "") - { - if (_stack == null || _stack.Count == 0) - { - throw Error.InvalidOperation($"Invalid snapshot generator state ({memberName}). Cannot operate on empty recursion stack."); - } - } - - } - -} diff --git a/src/Hl7.Fhir.Shared.Tests/Model/NullExtensionsTest.cs b/src/Hl7.Fhir.Shared.Tests/Model/NullExtensionsTest.cs index b60b76a1fc..eb887c01c8 100644 --- a/src/Hl7.Fhir.Shared.Tests/Model/NullExtensionsTest.cs +++ b/src/Hl7.Fhir.Shared.Tests/Model/NullExtensionsTest.cs @@ -47,22 +47,22 @@ public void TestIsNullOrEmpty_Extension() [TestMethod] public void TestIsNullOrEmpty_FhirUri() => testIsNullOrEmpty_StringPrimitive("http://example.org"); - void testIsNullOrEmpty_Primitive(V testValue, V emptyValue) where T : PrimitiveType, IValue, new() + private static void testIsNullOrEmpty_Primitive(V testValue, V emptyValue) where T : PrimitiveType, IValue, new() { var elem = new T(); Assert.IsTrue(elem.IsNullOrEmpty()); elem.Value = emptyValue; Assert.IsFalse(elem.IsNullOrEmpty()); - Assert.IsFalse((elem as Base).IsNullOrEmpty()); + Assert.IsFalse(elem.IsNullOrEmpty()); elem.Value = testValue; Assert.IsFalse(elem.IsNullOrEmpty()); - Assert.IsFalse((elem as Base).IsNullOrEmpty()); + Assert.IsFalse(elem.IsNullOrEmpty()); elem.Value = default; Assert.IsTrue(elem.IsNullOrEmpty()); - Assert.IsTrue((elem as Base).IsNullOrEmpty()); + Assert.IsTrue(elem.IsNullOrEmpty()); var extension = new Extension(); Assert.IsTrue(extension.IsNullOrEmpty()); @@ -74,7 +74,7 @@ public void TestIsNullOrEmpty_Extension() extension.Value = extensionValue; Assert.IsFalse(extension.IsNullOrEmpty()); Assert.IsFalse(elem.IsNullOrEmpty()); - Assert.IsFalse((elem as Base).IsNullOrEmpty()); + Assert.IsFalse(elem.IsNullOrEmpty()); extensionValue.Value = null; Assert.IsTrue(extensionValue.IsNullOrEmpty()); @@ -85,23 +85,20 @@ public void TestIsNullOrEmpty_Extension() Assert.IsTrue(elem.IsNullOrEmpty()); } - void testIsNullOrEmpty_StringPrimitive(string exampleValue = "test") where T : PrimitiveType, IValue, new() + private static void testIsNullOrEmpty_StringPrimitive(string exampleValue = "test") where T : PrimitiveType, IValue, new() { var elem = new T(); Assert.IsTrue(elem.IsNullOrEmpty()); elem.Value = string.Empty; Assert.IsTrue(elem.IsNullOrEmpty()); - Assert.IsTrue((elem as Base).IsNullOrEmpty()); Assert.IsFalse(string.IsNullOrEmpty(exampleValue)); elem.Value = exampleValue; Assert.IsFalse(elem.IsNullOrEmpty()); - Assert.IsFalse((elem as Base).IsNullOrEmpty()); elem.Value = null; Assert.IsTrue(elem.IsNullOrEmpty()); - Assert.IsTrue((elem as Base).IsNullOrEmpty()); var extension = new Extension(); Assert.IsTrue(extension.IsNullOrEmpty()); @@ -113,7 +110,6 @@ public void TestIsNullOrEmpty_Extension() extension.Value = extensionValue; Assert.IsFalse(extension.IsNullOrEmpty()); Assert.IsFalse(elem.IsNullOrEmpty()); - Assert.IsFalse((elem as Base).IsNullOrEmpty()); extensionValue.Value = null; Assert.IsTrue(extensionValue.IsNullOrEmpty()); @@ -188,4 +184,4 @@ public void TestIsNullOrEmpty_List() // Assert.IsTrue(codings.IsNullOrEmpty()); } } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Shared.Tests/Rest/FhirClientTests.cs b/src/Hl7.Fhir.Shared.Tests/Rest/FhirClientTests.cs index 9be9b35d5c..674c3d764d 100644 --- a/src/Hl7.Fhir.Shared.Tests/Rest/FhirClientTests.cs +++ b/src/Hl7.Fhir.Shared.Tests/Rest/FhirClientTests.cs @@ -356,10 +356,8 @@ public async Tasks.Task CreateAndFullRepresentationHttpClient() // Now validate this resource client.Settings.PreferredReturn = Prefer.ReturnRepresentation; // which is also the default - var p = new Parameters - { - { "resource", pat } - }; + var p = new Parameters(); + p.Add("resource", pat); var oI = await client.InstanceOperationAsync(ri.WithoutVersion(), "validate", p); oI.Should().BeOfType(); } diff --git a/src/Hl7.Fhir.Shared.Tests/Serialization/SummarySerializationTests.cs b/src/Hl7.Fhir.Shared.Tests/Serialization/SummarySerializationTests.cs index a288407ba4..e85bfca12e 100644 --- a/src/Hl7.Fhir.Shared.Tests/Serialization/SummarySerializationTests.cs +++ b/src/Hl7.Fhir.Shared.Tests/Serialization/SummarySerializationTests.cs @@ -6,6 +6,7 @@ * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE */ +using FluentAssertions; using Hl7.Fhir.ElementModel; using Hl7.Fhir.Model; using Hl7.Fhir.Rest; @@ -314,7 +315,7 @@ public async Tasks.Task TestBundleWithSummaryJson() var actualData = inJson ? await FhirJsonSerializer.SerializeToStringAsync(bundle, mode) : await FhirXmlSerializer.SerializeToStringAsync(bundle, mode); var expectedData = TestDataHelper.ReadTestData(expectedFile); - Assert.AreEqual(actualData, expectedData); + actualData.Should().Be(expectedData); } } diff --git a/src/Hl7.Fhir.Shims.Base/Hl7.Fhir.Shims.Base.projitems b/src/Hl7.Fhir.Shims.Base/Hl7.Fhir.Shims.Base.projitems index a39943ed7e..f6a98a1b7d 100644 --- a/src/Hl7.Fhir.Shims.Base/Hl7.Fhir.Shims.Base.projitems +++ b/src/Hl7.Fhir.Shims.Base/Hl7.Fhir.Shims.Base.projitems @@ -10,7 +10,12 @@ + + + + + diff --git a/src/Hl7.Fhir.Conformance/Specification/Snapshot/ElementIdGenerator.cs b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/ElementIdGenerator.cs similarity index 100% rename from src/Hl7.Fhir.Conformance/Specification/Snapshot/ElementIdGenerator.cs rename to src/Hl7.Fhir.Shims.Base/Specification/Snapshot/ElementIdGenerator.cs diff --git a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGeneratorAnnotations.cs b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorAnnotations.cs similarity index 96% rename from src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGeneratorAnnotations.cs rename to src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorAnnotations.cs index be4257bf0e..da82506c38 100644 --- a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGeneratorAnnotations.cs +++ b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorAnnotations.cs @@ -71,7 +71,9 @@ internal static void RemoveAllConstrainedByDiffAnnotations(this Base element) { if (element == null) { throw Error.ArgumentNull(nameof(element)); } element.RemoveConstrainedByDiffAnnotation(); - foreach (var child in element.Children) +#pragma warning disable CS0618 // Type or member is obsolete + foreach (var child in element.Children()) +#pragma warning restore CS0618 // Type or member is obsolete { child.RemoveAllConstrainedByDiffAnnotations(); } @@ -98,7 +100,9 @@ internal static void RemoveAllConstrainedByDiffAnnotations(this IEnumerable elem != null && ( elem.HasAnnotation() - || elem.Children.Any(e => e.HasDiffConstraintAnnotations()) +#pragma warning disable CS0618 // Type or member is obsolete + || elem.Children().Any(e => e.HasDiffConstraintAnnotations()) +#pragma warning restore CS0618 // Type or member is obsolete ); #endregion @@ -232,4 +236,4 @@ internal static bool HasSnapshotElementAnnotation(this ElementDefinition ed) #endregion } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGeneratorErrors.cs b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorErrors.cs similarity index 100% rename from src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGeneratorErrors.cs rename to src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorErrors.cs diff --git a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGeneratorEvents.cs b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorEvents.cs similarity index 100% rename from src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotGeneratorEvents.cs rename to src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotGeneratorEvents.cs diff --git a/src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotRecursionStack.cs b/src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotRecursionStack.cs similarity index 100% rename from src/Hl7.Fhir.Conformance/Specification/Snapshot/SnapshotRecursionStack.cs rename to src/Hl7.Fhir.Shims.Base/Specification/Snapshot/SnapshotRecursionStack.cs diff --git a/src/Hl7.Fhir.Shims.Base/Specification/Terminology/LocalTerminologyService.cs b/src/Hl7.Fhir.Shims.Base/Specification/Terminology/LocalTerminologyService.cs index 2db0593dd4..d86320388c 100644 --- a/src/Hl7.Fhir.Shims.Base/Specification/Terminology/LocalTerminologyService.cs +++ b/src/Hl7.Fhir.Shims.Base/Specification/Terminology/LocalTerminologyService.cs @@ -298,11 +298,9 @@ private async Task validateCodeVS(ValueSet vs, string? code, string? { if (code is null) { - var resultParam = new Parameters - { - { "message", new FhirString("No code supplied.") }, - { "result", new FhirBoolean(false) } - }; + var resultParam = new Parameters(); + resultParam.Add("message", new FhirString("No code supplied.")); + resultParam.Add("result", new FhirBoolean(false)); return resultParam; } diff --git a/src/Hl7.Fhir.Specification.STU3.Tests/Terminology/LocalTerminologyServiceTests.cs b/src/Hl7.Fhir.Specification.STU3.Tests/Terminology/LocalTerminologyServiceTests.cs index 830ca49c40..c9b3348576 100644 --- a/src/Hl7.Fhir.Specification.STU3.Tests/Terminology/LocalTerminologyServiceTests.cs +++ b/src/Hl7.Fhir.Specification.STU3.Tests/Terminology/LocalTerminologyServiceTests.cs @@ -36,7 +36,10 @@ public async Task CodeNotFoundMessageTest(string valueset, string code, string c var withSystem = string.IsNullOrEmpty(system) ? string.Empty : $" from system '{system}'"; var result = await _service.ValueSetValidateCode(parameters.Build()); result.Parameter.Should().Contain(p => p.Name == "message") - .Subject.Value.Should().BeEquivalentTo(new FhirString($"Code '{code}'{withSystem} does not exist in the value set '{valuesetTitle}' ({valueset})")); + .Subject.Value + .IsExactly(new FhirString( + $"Code '{code}'{withSystem} does not exist in the value set '{valuesetTitle}' ({valueset})")) + .Should().BeTrue(); } [DataTestMethod] @@ -50,7 +53,8 @@ public async Task CodingWithValuesetAsSystem(string valueset, string code, strin var result = await _service.ValueSetValidateCode(parameters.Build()); result.Parameter.Should().Contain(p => p.Name == "message") - .Subject.Value.Should().BeEquivalentTo(new FhirString($"The Coding references a value set, not a code system ('{system}')")); + .Subject.Value.IsExactly(new FhirString($"The Coding references a value set, not a code system ('{system}')")) + .Should().BeTrue(); } [TestMethod] @@ -67,7 +71,7 @@ public async Task DefaultCoreServiceTest() var result = await service.ValueSetValidateCode(parameters); result.Parameter.Should().Contain(p => p.Name == "result") - .Subject.Value.Should().BeEquivalentTo(new FhirBoolean(true)); + .Subject.Value.IsExactly(new FhirBoolean(true)).Should().BeTrue(); } } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Specification.Shared.Tests/Terminology/LocalTerminologyServiceTests.cs b/src/Hl7.Fhir.Specification.Shared.Tests/Terminology/LocalTerminologyServiceTests.cs index 5ebdf049f8..16fedc6f3b 100644 --- a/src/Hl7.Fhir.Specification.Shared.Tests/Terminology/LocalTerminologyServiceTests.cs +++ b/src/Hl7.Fhir.Specification.Shared.Tests/Terminology/LocalTerminologyServiceTests.cs @@ -37,7 +37,8 @@ public async Task CodeNotFoundMessageTest(string valueset, string code, string c var withSystem = string.IsNullOrEmpty(system) ? string.Empty : $" from system '{system}'"; var result = await _service.ValueSetValidateCode(parameters.Build()); result.Parameter.Should().Contain(p => p.Name == "message") - .Subject.Value.Should().BeEquivalentTo(new FhirString($"Code '{code}'{withSystem} does not exist in the value set '{valuesetTitle}' ({valueset})")); + .Subject.Value.IsExactly(new FhirString($"Code '{code}'{withSystem} does not exist in the value set '{valuesetTitle}' ({valueset})")) + .Should().BeTrue(); } [DataTestMethod] @@ -51,7 +52,8 @@ public async Task CodingWithValuesetAsSystem(string valueset, string code, strin var result = await _service.ValueSetValidateCode(parameters.Build()); result.Parameter.Should().Contain(p => p.Name == "message") - .Subject.Value.Should().BeEquivalentTo(new FhirString($"The Coding references a value set, not a code system ('{system}')")); + .Subject.Value.IsExactly(new FhirString($"The Coding references a value set, not a code system ('{system}')")) + .Should().BeTrue(); } [TestMethod] @@ -68,7 +70,7 @@ public async Task DefaultCoreServiceTest() var result = await service.ValueSetValidateCode(parameters); result.Parameter.Should().Contain(p => p.Name == "result") - .Subject.Value.Should().BeEquivalentTo(new FhirBoolean(true)); + .Subject.Value.IsExactly(new FhirBoolean(true)).Should().BeTrue(); } [TestMethod] @@ -115,4 +117,4 @@ public async Task CheckErrorBarrier() ex.WithMessage("*compositional code system*"); } } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Support.Poco.Tests/Model/ModelTests.cs b/src/Hl7.Fhir.Support.Poco.Tests/Model/ModelTests.cs index e58b18dff6..d161ca30bd 100644 --- a/src/Hl7.Fhir.Support.Poco.Tests/Model/ModelTests.cs +++ b/src/Hl7.Fhir.Support.Poco.Tests/Model/ModelTests.cs @@ -6,6 +6,7 @@ * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE */ +using FluentAssertions; using Hl7.Fhir.Model; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; @@ -13,417 +14,431 @@ using System.Linq; using System.Xml.Linq; -namespace Hl7.Fhir.Tests.Model +namespace Hl7.Fhir.Tests.Model; + +[TestClass] +public class ModelTests { - [TestClass] - public class ModelTests + [TestMethod] + public void ValidateElementAssertions() { - [TestMethod] - public void ValidateElementAssertions() - { - XElement xr = new XElement("root", - new XElement("child", "value"), - new XElement("child", "value2")); + XElement xr = new XElement("root", + new XElement("child", "value"), + new XElement("child", "value2")); - Assert.IsNull(xr.Element("childx")); - Assert.AreEqual(0, xr.Elements("childx").Count()); - Assert.AreEqual("value", xr.Element("child").Value); - } + Assert.IsNull(xr.Element("childx")); + Assert.AreEqual(0, xr.Elements("childx").Count()); + Assert.AreEqual("value", xr.Element("child")?.Value); + } - [TestMethod] - public void OperationOutcomeExpression() + [TestMethod] + public void OperationOutcomeExpression() + { + var oo = new OperationOutcome(); + oo.Issue.Add(new OperationOutcome.IssueComponent() { - OperationOutcome oo = new OperationOutcome(); - oo.Issue.Add(new OperationOutcome.IssueComponent() - { - Expression = new string[] { "this" } - }); - Assert.AreEqual(1, oo.Issue[0].Expression.Count()); - } + Expression = ["this"] + }); + Assert.AreEqual(1, oo.Issue[0].Expression.Count()); + } - [TestMethod] - public void Uri_Canonical() - { - var identifier = new Identifier("http://nhi.health.nz", "123"); - Assert.AreEqual("123", identifier.Value); - Assert.AreEqual("http://nhi.health.nz", identifier.System); - } + [TestMethod] + public void Uri_Canonical() + { + var identifier = new Identifier("http://nhi.health.nz", "123"); + Assert.AreEqual("123", identifier.Value); + Assert.AreEqual("http://nhi.health.nz", identifier.System); + } + + [TestMethod] + public void TestBundleLinkEncoding() + { + test("http://foo/bar?param1={0}¶m2={1}"); + test("http://foo/bar/../bar?param1={0}¶m2={1}"); + test("bar?param1={0}¶m2={1}"); + test("bar/../bar?param1={0}¶m2={1}"); + return; - [TestMethod] - public void TestBundleLinkEncoding() + static void test(string urlFormat) { - Action test = (urlFormat) => + var param1 = "baz/123"; + var param2 = "qux:456"; + var manuallyEncodedUrl = string.Format(urlFormat, "baz%2F123", "qux%3A456"); + var uriEncodedUrl = string.Format(urlFormat, Uri.EscapeDataString(param1), Uri.EscapeDataString(param2)); + Assert.AreEqual(manuallyEncodedUrl, uriEncodedUrl); + var uri = new Uri(manuallyEncodedUrl, UriKind.RelativeOrAbsolute); + var bundle = new Bundle { SelfLink = uri }; + if (uri.IsAbsoluteUri) { - var param1 = "baz/123"; - var param2 = "qux:456"; - var manuallyEncodedUrl = string.Format(urlFormat, "baz%2F123", "qux%3A456"); - var uriEncodedUrl = string.Format(urlFormat, Uri.EscapeDataString(param1), Uri.EscapeDataString(param2)); - Assert.AreEqual(manuallyEncodedUrl, uriEncodedUrl); - var uri = new Uri(manuallyEncodedUrl, UriKind.RelativeOrAbsolute); - var bundle = new Bundle { SelfLink = uri }; - if (uri.IsAbsoluteUri) - { - Assert.AreEqual(uri.AbsoluteUri, bundle.SelfLink.AbsoluteUri); - } - else - { - Assert.AreEqual(uri.OriginalString, bundle.SelfLink.OriginalString); - } - }; - - test("http://foo/bar?param1={0}¶m2={1}"); - test("http://foo/bar/../bar?param1={0}¶m2={1}"); - test("bar?param1={0}¶m2={1}"); - test("bar/../bar?param1={0}¶m2={1}"); + Assert.AreEqual(uri.AbsoluteUri, bundle.SelfLink.AbsoluteUri); + } + else + { + Assert.AreEqual(uri.OriginalString, bundle.SelfLink.OriginalString); + } } + } - [TestMethod] - public void SimpleValueSupport() - { - Bundle b = new(); - - Assert.IsNull(b.Total); - b.Total = 10; - Assert.AreEqual(10, b.Total.GetValueOrDefault()); - Assert.IsNotNull(b.Total); - - OperationOutcome.IssueComponent ic = new(); - - ic.DiagnosticsElement = new FhirString("Furore"); - Assert.AreEqual("Furore", ic.Diagnostics); - ic.Diagnostics = null; - Assert.IsNull(ic.DiagnosticsElement); - ic.Diagnostics = "Furore"; - Assert.IsNotNull(ic.DiagnosticsElement); - - ic.Expression = new string[] { "json", "xml" }; - Assert.IsNotNull(ic.ExpressionElement); - Assert.AreEqual(2, ic.ExpressionElement.Count); - Assert.AreEqual("json", ic.ExpressionElement.First().Value); - - ic.ExpressionElement = new List(); - ic.ExpressionElement.Add(new FhirString("csv")); - Assert.IsNotNull(ic.Expression); - Assert.AreEqual(1, ic.Expression.Count()); - } + [TestMethod] + public void SimpleValueSupport() + { + Bundle b = new(); + + Assert.IsNull(b.Total); + b.Total = 10; + Assert.AreEqual(10, b.Total.GetValueOrDefault()); + Assert.IsNotNull(b.Total); + + OperationOutcome.IssueComponent ic = new() { DiagnosticsElement = new FhirString("Furore") }; + Assert.AreEqual("Furore", ic.Diagnostics); + ic.Diagnostics = null; + Assert.IsNull(ic.DiagnosticsElement); + ic.Diagnostics = "Furore"; + Assert.IsNotNull(ic.DiagnosticsElement); + + ic.Expression = new string[] { "json", "xml" }; + Assert.IsNotNull(ic.ExpressionElement); + Assert.AreEqual(2, ic.ExpressionElement.Count); + Assert.AreEqual("json", ic.ExpressionElement.First().Value); + + ic.ExpressionElement = new List(); + ic.ExpressionElement.Add(new FhirString("csv")); + Assert.IsNotNull(ic.Expression); + Assert.AreEqual(1, ic.Expression.Count()); + } - [TestMethod] - public void ExtensionManagement() - { - Patient p = new(); - var u1 = "http://fhir.org/ext/ext-test"; - Assert.IsNull(p.GetExtension("http://fhir.org/ext/ext-test")); + [TestMethod] + public void ExtensionManagement() + { + Patient p = new(); + var u1 = "http://fhir.org/ext/ext-test"; + Assert.IsNull(p.GetExtension("http://fhir.org/ext/ext-test")); - Extension newEx = p.SetExtension(u1, new FhirBoolean(true)); - Assert.AreSame(newEx, p.GetExtension(u1)); + Extension newEx = p.SetExtension(u1, new FhirBoolean(true)); + Assert.AreSame(newEx, p.GetExtension(u1)); - p.AddExtension("http://fhir.org/ext/ext-test2", new FhirString("Ewout")); - Assert.AreSame(newEx, p.GetExtension(u1)); + p.AddExtension("http://fhir.org/ext/ext-test2", new FhirString("Ewout")); + Assert.AreSame(newEx, p.GetExtension(u1)); - p.RemoveExtension(u1); - Assert.IsNull(p.GetExtension(u1)); + p.RemoveExtension(u1); + Assert.IsNull(p.GetExtension(u1)); - p.SetExtension("http://fhir.org/ext/ext-test2", new FhirString("Ewout Kramer")); - var ew = p.GetExtensions("http://fhir.org/ext/ext-test2"); - Assert.AreEqual(1, ew.Count()); + p.SetExtension("http://fhir.org/ext/ext-test2", new FhirString("Ewout Kramer")); + var ew = p.GetExtensions("http://fhir.org/ext/ext-test2"); + Assert.AreEqual(1, ew.Count()); - p.AddExtension("http://fhir.org/ext/ext-test2", new FhirString("Wouter Kramer")); + p.AddExtension("http://fhir.org/ext/ext-test2", new FhirString("Wouter Kramer")); - ew = p.GetExtensions("http://fhir.org/ext/ext-test2"); - Assert.AreEqual(2, ew.Count()); + ew = p.GetExtensions("http://fhir.org/ext/ext-test2"); + Assert.AreEqual(2, ew.Count()); - Assert.AreEqual(0, p.ModifierExtension.Count()); - var me = p.AddExtension("http://fhir.org/ext/ext-test3", new FhirString("bla"), isModifier: true); - Assert.AreEqual(1, p.ModifierExtension.Count()); - Assert.AreEqual(me, p.GetExtension("http://fhir.org/ext/ext-test3")); - Assert.AreEqual(me, p.GetExtensions("http://fhir.org/ext/ext-test3").Single()); - Assert.AreEqual(3, p.AllExtensions().Count()); + Assert.AreEqual(0, p.ModifierExtension.Count()); + var me = p.AddExtension("http://fhir.org/ext/ext-test3", new FhirString("bla"), isModifier: true); + Assert.AreEqual(1, p.ModifierExtension.Count()); + Assert.AreEqual(me, p.GetExtension("http://fhir.org/ext/ext-test3")); + Assert.AreEqual(me, p.GetExtensions("http://fhir.org/ext/ext-test3").Single()); + Assert.AreEqual(3, p.AllExtensions().Count()); - var code = new Code("test"); - p.AddExtension("http://fhir.org/ext/code", code); - Assert.AreEqual(code, p.GetExtensionValue("http://fhir.org/ext/code")); + var code = new Code("test"); + p.AddExtension("http://fhir.org/ext/code", code); + Assert.AreEqual(code, p.GetExtensionValue("http://fhir.org/ext/code")); - var text = new FhirString("test"); - p.AddExtension("http://fhir.org/ext/string", text); - Assert.AreEqual(text, p.GetExtensionValue("http://fhir.org/ext/string")); + var text = new FhirString("test"); + p.AddExtension("http://fhir.org/ext/string", text); + Assert.AreEqual(text, p.GetExtensionValue("http://fhir.org/ext/string")); - var fhirbool = new FhirBoolean(true); - p.AddExtension("http://fhir.org/ext/bool", fhirbool); - Assert.AreEqual(fhirbool, p.GetExtensionValue("http://fhir.org/ext/bool")); + var fhirbool = new FhirBoolean(true); + p.AddExtension("http://fhir.org/ext/bool", fhirbool); + Assert.AreEqual(fhirbool, p.GetExtensionValue("http://fhir.org/ext/bool")); - } + } - [TestMethod] - public void RecognizeContainedReference() - { - var rref = new ResourceReference() { Reference = "#patient2223432" }; + [TestMethod] + public void RecognizeContainedReference() + { + var rref = new ResourceReference() { Reference = "#patient2223432" }; - Assert.IsTrue(rref.IsContainedReference); + Assert.IsTrue(rref.IsContainedReference); - rref.Reference = "http://somehwere.nl/Patient/1"; - Assert.IsFalse(rref.IsContainedReference); + rref.Reference = "http://somehwere.nl/Patient/1"; + Assert.IsFalse(rref.IsContainedReference); - rref.Reference = "Patient/1"; - Assert.IsFalse(rref.IsContainedReference); - } + rref.Reference = "Patient/1"; + Assert.IsFalse(rref.IsContainedReference); + } - [TestMethod] - public void FindContainedResource() + [TestMethod] + public void FindContainedResource() + { + var cPat1 = new Patient() { Id = "pat1" }; + var cPat2 = new Patient() { Id = "pat2" }; + var pat = new Patient { - var cPat1 = new Patient() { Id = "pat1" }; - var cPat2 = new Patient() { Id = "pat2" }; - var pat = new Patient - { - Contained = new List { cPat1, cPat2 } - }; + Contained = [cPat1, cPat2] + }; - var rref = new ResourceReference() { Reference = "#pat2" }; + var rref = new ResourceReference() { Reference = "#pat2" }; - Assert.IsNotNull(pat.FindContainedResource(rref), "#pat2 should be in the contained resources"); - Assert.IsNotNull(pat.FindContainedResource("#pat1"), "#pat1 should be in the contained resources"); + Assert.IsNotNull(pat.FindContainedResource(rref), "#pat2 should be in the contained resources"); + Assert.IsNotNull(pat.FindContainedResource("#pat1"), "#pat1 should be in the contained resources"); - rref.Reference = "#pat3"; - Assert.IsNull(pat.FindContainedResource(rref)); + rref.Reference = "#pat3"; + Assert.IsNull(pat.FindContainedResource(rref)); - Assert.AreEqual(pat, pat.FindContainedResource("#")); + Assert.AreEqual(pat, pat.FindContainedResource("#")); - var pat2 = new Patient(); - Assert.IsNull(pat2.FindContainedResource("#pat1")); - } + var pat2 = new Patient(); + Assert.IsNull(pat2.FindContainedResource("#pat1")); + } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void FindContainedResourceExceptionExpected() + [TestMethod] + [ExpectedException(typeof(ArgumentNullException))] + public void FindContainedResourceExceptionExpected() + { + var cPat1 = new Patient() { Id = "pat1" }; + var cPat2 = new Patient() { Id = "pat2" }; + var pat = new Patient { - var cPat1 = new Patient() { Id = "pat1" }; - var cPat2 = new Patient() { Id = "pat2" }; - var pat = new Patient - { - Contained = new List { cPat1, cPat2 } - }; + Contained = [cPat1, cPat2] + }; - pat.FindContainedResource((ResourceReference)null); - } + pat.FindContainedResource((ResourceReference)null); + } - [TestMethod] - public void TestListDeepCopy() - { - var x = new List(); - x.Add(new Patient()); - x.Add(new Patient()); - - var y = new List(x.DeepCopy()); - Assert.IsTrue(x[0] is Patient); - Assert.AreNotEqual(x[0], y[0]); - Assert.AreNotEqual(x[1], y[1]); - } + [TestMethod] + public void TestListDeepCopy() + { + var x = new List { new(), new() }; + var y = new List(x.DeepCopy()); + Assert.IsTrue(x[0] != null); + Assert.AreNotEqual(x[0], y[0]); + Assert.AreNotEqual(x[1], y[1]); + } - [TestMethod] - public void TestLazyCreatedLists() - { - var p = new Patient(); - p.Name.Add(new HumanName()); - } + [TestMethod] + public void TestLazyCreatedLists() + { + var p = new Patient(); + p.Name.Add(new HumanName()); + } - [TestMethod] - public void TestStringValueInterface() - { - IValue sv = new FhirString("test"); - Assert.IsNotNull(sv); - sv.Value = "string"; - Assert.AreEqual(sv.Value, "string"); - - sv = new FhirUri("test"); - Assert.IsNotNull(sv); - sv.Value = "http://example.org"; - Assert.AreEqual(sv.Value, "http://example.org"); - - sv = new Uuid("test"); - Assert.IsNotNull(sv); - sv.Value = "550e8400-e29b-41d4-a716-446655440000"; - Assert.AreEqual(sv.Value, "550e8400-e29b-41d4-a716-446655440000"); - - sv = new Oid("test"); - Assert.IsNotNull(sv); - sv.Value = "2.16.840.1.113883"; - Assert.AreEqual(sv.Value, "2.16.840.1.113883"); - - sv = new Markdown("test"); - Assert.IsNotNull(sv); - sv.Value = "Hello World!"; - Assert.AreEqual(sv.Value, "Hello World!"); - - sv = new Date(); - Assert.IsNotNull(sv); - sv.Value = "20161201"; - Assert.AreEqual(sv.Value, "20161201"); - - sv = new Time(); - Assert.IsNotNull(sv); - sv.Value = "23:59:00"; - Assert.AreEqual(sv.Value, "23:59:00"); - - sv = new FhirDateTime(DateTimeOffset.UtcNow); - Assert.IsNotNull(sv); - sv.Value = "20161201 23:59:00"; - Assert.AreEqual(sv.Value, "20161201 23:59:00"); - } + [TestMethod] + public void TestStringValueInterface() + { + IValue sv = new FhirString("test"); + Assert.IsNotNull(sv); + sv.Value = "string"; + Assert.AreEqual(sv.Value, "string"); + + sv = new FhirUri("test"); + Assert.IsNotNull(sv); + sv.Value = "http://example.org"; + Assert.AreEqual(sv.Value, "http://example.org"); + + sv = new Uuid("test"); + Assert.IsNotNull(sv); + sv.Value = "550e8400-e29b-41d4-a716-446655440000"; + Assert.AreEqual(sv.Value, "550e8400-e29b-41d4-a716-446655440000"); + + sv = new Oid("test"); + Assert.IsNotNull(sv); + sv.Value = "2.16.840.1.113883"; + Assert.AreEqual(sv.Value, "2.16.840.1.113883"); + + sv = new Markdown("test"); + Assert.IsNotNull(sv); + sv.Value = "Hello World!"; + Assert.AreEqual(sv.Value, "Hello World!"); + + sv = new Date(); + Assert.IsNotNull(sv); + sv.Value = "20161201"; + Assert.AreEqual(sv.Value, "20161201"); + + sv = new Time(); + Assert.IsNotNull(sv); + sv.Value = "23:59:00"; + Assert.AreEqual(sv.Value, "23:59:00"); + + sv = new FhirDateTime(DateTimeOffset.UtcNow); + Assert.IsNotNull(sv); + sv.Value = "20161201 23:59:00"; + Assert.AreEqual(sv.Value, "20161201 23:59:00"); + } - [TestMethod] - public void TestIntegerValueInterface() - { - INullableValue iv = new Integer(null); - Assert.IsNotNull(iv); - iv.Value = 12345; - Assert.AreEqual(iv.Value, 12345); - - iv = new UnsignedInt(0); - Assert.IsNotNull(iv); - iv.Value = 12345; - Assert.AreEqual(iv.Value, 12345); - - iv = new PositiveInt(1); - Assert.IsNotNull(iv); - iv.Value = 12345; - Assert.AreEqual(iv.Value, 12345); - } - [TestMethod] - public void TestChildren_EmptyPatient() - { - var patient = new Patient(); - var children = patient.Children.ToArray(); - Base[] expected = { }; - Assert.IsTrue(expected.SequenceEqual(children)); - } + [TestMethod] + public void TestIntegerValueInterface() + { + INullableValue iv = new Integer(null); + Assert.IsNotNull(iv); + iv.Value = 12345; + Assert.AreEqual(iv.Value, 12345); + + iv = new UnsignedInt(0); + Assert.IsNotNull(iv); + iv.Value = 12345; + Assert.AreEqual(iv.Value, 12345); + + iv = new PositiveInt(1); + Assert.IsNotNull(iv); + iv.Value = 12345; + Assert.AreEqual(iv.Value, 12345); + } - [TestMethod] - public void TestChildren_EmptyHumanName() - { - var timing = new HumanName(); - var children = timing.Children.ToArray(); - Base[] expected = { }; - Assert.IsTrue(expected.SequenceEqual(children)); - } + [TestMethod] + public void ToStringHandlesNullObjectValue() + { + var s = new FhirString(null); + Assert.IsNull(s.ToString()); - [TestMethod] - public void ToStringHandlesNullObjectValue() - { - var s = new FhirString(null); - Assert.IsNull(s.ToString()); + var i = new FhirBoolean(null); + Assert.IsNull(i.ToString()); + } - var i = new FhirBoolean(null); - Assert.IsNull(i.ToString()); - } +#pragma warning disable CS0618 // Type or member is obsolete + [TestMethod] + public void ChildrenHandlesExceptionCasesCorrectly() + { + //"Narrative.div" => $"new FhirString({info.PropertyName}.Value)", + // "Element.id" => $"new FhirString({info.PropertyName})", + // "Extension.url" => $"new FhirUri({info.PropertyName})", + var n = new Narrative("

bla

") { ElementId = "id1", Status = Narrative.NarrativeStatus.Additional }; + + n.Children().IsExactly([new FhirString("id1"), new Code(Narrative.NarrativeStatus.Additional), new FhirString("

bla

") ]) + .Should().BeTrue(); + + var e = new Extension("http://nu.nl", new FhirBoolean(true)); + e.Children().IsExactly([new FhirUri("http://nu.nl"), new FhirBoolean(true)]).Should().BeTrue(); + } + + [TestMethod] + public void TestChildren_EmptyResource() + { + var oo = new OperationOutcome(); + var children = oo.Children().ToArray(); + Base[] expected = []; + Assert.IsTrue(expected.SequenceEqual(children)); + } - [TestMethod] - public void TestChildren_Patient() + [TestMethod] + public void TestChildren_EmptyDataType() + { + var timing = new Identifier(); + var children = timing.Children().ToArray(); + Base[] expected = []; + Assert.IsTrue(expected.SequenceEqual(children)); + } + + [TestMethod] + public void TestChildren_Patient() + { + var patient = new Patient { - var patient = new Patient() + Name = { - Name = + new HumanName() { - new HumanName() - { - Given = new string[] { "John" }, - Family = "Doe" - }, - new HumanName() - { - Given = new string[] { "Alias" }, - Family = "Alternate" - } + Given = ["John"], + Family = "Doe" }, - Address = + new HumanName() { - new Address() - { - City = "Amsterdam", - Line = new string[] { "Rokin" } - } + Given = ["Alias"], + Family = "Alternate" } - }; - var children = patient.Children.ToArray(); - Base[] expected = - { - // ===== Resource elements ===== - // patient.IdElement, patient.Meta, patient.ImplicitRulesElement, patient.LanguageElement, - - // ===== DomainResource elements ===== - // patient.Text, - // patient.Contained = empty collection - // patient.Extension = empty collection - // patient.ModifierExtension = empty collection - - // ===== Patient elements ===== - // patient.Identifier = empty collection - // patient.ActiveElement, - patient.Name[0], - patient.Name[1], - // patient.Telecom = empty collection - // patient.GenderElement, - // patient.BirthDateElement, - // patient.Deceased, - patient.Address[0], - // patient.MaritalStatus, - // patient.MultipleBirth, - // patient.Photo = empty collection - // patient.Contact = empty collection - // patient.Animal, - // patient.Communication = empty collection - // patient.CareProvider = empty collection - // patient.ManagingOrganization - // patient.Link = empty collection - }; - Assert.IsTrue(expected.SequenceEqual(children)); - - var name = patient.Name[0]; - children = name.Children.ToArray(); - expected = new Base[] + }, + Address = { - // ===== Element elements ===== - // name.Extension = empty collection - - // ===== HumanName elements ===== - // name.UseElement, - // name.TextElement, - name.FamilyElement, - name.GivenElement[0], - // name.Period - }; - Assert.IsTrue(expected.SequenceEqual(children)); - - var address = patient.Address[0]; - children = address.Children.ToArray(); - expected = new Base[] - { - // ===== Element elements ===== - // name.Extension = empty collection - - // ===== Address elements ===== - // address.UseElement, - // address.TypeElement, - // address.TextElement, - address.LineElement[0], - address.CityElement, - // address.DistrictElement, - // address.StateElement, - // address.PostalCodeElement, - // address.CountryElement, - // address.Period - }; - Assert.IsTrue(expected.SequenceEqual(children)); - } + new Address() + { + City = "Amsterdam", + Line = ["Rokin"] + } + } + }; + var children = patient.Children().ToArray(); + Base[] expected = + [ + // ===== Resource elements ===== + // patient.IdElement, patient.Meta, patient.ImplicitRulesElement, patient.LanguageElement, + + // ===== DomainResource elements ===== + // patient.Text, + // patient.Contained = empty collection + // patient.Extension = empty collection + // patient.ModifierExtension = empty collection + + // ===== Patient elements ===== + // patient.Identifier = empty collection + // patient.ActiveElement, + patient.Name[0], + patient.Name[1], + // patient.Telecom = empty collection + // patient.GenderElement, + // patient.BirthDateElement, + // patient.Deceased, + patient.Address[0] + // patient.MaritalStatus, + // patient.MultipleBirth, + // patient.Photo = empty collection + // patient.Contact = empty collection + // patient.Animal, + // patient.Communication = empty collection + // patient.CareProvider = empty collection + // patient.ManagingOrganization + // patient.Link = empty collection + ]; + Assert.IsTrue(expected.SequenceEqual(children)); + + var name = patient.Name[0]; + children = name.Children().ToArray(); + expected = + [ + // ===== Element elements ===== + // name.Extension = empty collection + + // ===== HumanName elements ===== + // name.UseElement, + // name.TextElement, + name.FamilyElement, + name.GivenElement[0] + // name.Period + ]; + Assert.IsTrue(expected.SequenceEqual(children)); + + var address = patient.Address[0]; + children = address.Children().ToArray(); + expected = + [ + // ===== Element elements ===== + // name.Extension = empty collection + + // ===== Address elements ===== + // address.UseElement, + // address.TypeElement, + // address.TextElement, + address.LineElement[0], + address.CityElement + // address.DistrictElement, + // address.StateElement, + // address.PostalCodeElement, + // address.CountryElement, + // address.Period + ]; + Assert.IsTrue(expected.SequenceEqual(children)); } -} \ No newline at end of file +} + +#pragma warning restore CS0618 // Type or member is obsolete \ No newline at end of file diff --git a/src/Hl7.Fhir.Support.Poco.Tests/Model/PocoDictionaryTests.cs b/src/Hl7.Fhir.Support.Poco.Tests/Model/PocoDictionaryTests.cs index 1acd617c99..f7b761f672 100644 --- a/src/Hl7.Fhir.Support.Poco.Tests/Model/PocoDictionaryTests.cs +++ b/src/Hl7.Fhir.Support.Poco.Tests/Model/PocoDictionaryTests.cs @@ -1,11 +1,8 @@ using FluentAssertions; using Hl7.Fhir.Model; -using Hl7.Fhir.Utility; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic; -using System.Linq; -using IRO = System.Collections.Generic.IReadOnlyDictionary; namespace Hl7.Fhir.Tests.Model; @@ -34,13 +31,13 @@ public void DynamicResourceAcceptsEverything() dr["weight"].Should().Be(80.0m); dr["name"] = null!; - dr.AsReadOnlyDictionary().ContainsKey("name").Should().BeFalse(); + dr.TryGetValue("name", out _).Should().BeFalse(); } [TestMethod] public void ResourceAcceptsOverflow() { - var pat = new Patient().AsDictionary(); + var pat = new Patient(); // setting an existing property to an incorrect type should fail. Assert.ThrowsException(() => pat["name"] = "John"); @@ -56,7 +53,7 @@ public void ResourceAcceptsOverflow() pat["name"] = null!; pat["weight"] = null!; - pat.Should().BeEmpty(); + pat.GetElementPairs().Should().BeEmpty(); } [TestMethod] @@ -70,155 +67,15 @@ public void CanReadSpecialProperties() }; patient.AddExtension("http://nu.nl", new FhirBoolean(true)); - var pat = patient.AsReadOnlyDictionary(); - pat["active"].Should().BeOfType().And - .BeAssignableTo().Which["value"].Should().Be(true); - pat["text"].Should().BeOfType().And - .BeAssignableTo().Which["div"].Should().BeOfType().And - .BeAssignableTo().Which["value"].Should().Be("
hello
"); - pat["meta"].Should().BeOfType().And - .BeAssignableTo().Which["id"].Should().Be("4"); - var extension = pat["extension"].Should().BeOfType>().Which.Should().ContainSingle().Subject; - extension.Should().BeAssignableTo().Which["url"].Should().Be("http://nu.nl"); + patient["active"].Should().BeOfType().And + .BeAssignableTo().Which["value"].Should().Be(true); + patient["text"].Should().BeOfType().And + .BeAssignableTo().Which["div"].Should().BeOfType().And + .BeAssignableTo().Which["value"].Should().Be("
hello
"); + patient["meta"].Should().BeOfType().And + .BeAssignableTo().Which["id"].Should().Be("4"); + var extension = patient["extension"].Should().BeOfType>().Which.Should().ContainSingle().Subject; + extension.Should().BeAssignableTo().Which["url"].Should().Be("http://nu.nl"); } - - [TestMethod] - public void CanEnumerateFhirPrimitive() - { - IReadOnlyDictionary b = new FhirBoolean(null); - b.Count.Should().Be(0); - b.Any().Should().Be(false); - - b = new FhirBoolean(true); - b.Count.Should().Be(1); - b.First().Should().BeEquivalentTo(KeyValuePair.Create("value", true)); - - var nb = new FhirBoolean(true); - nb.SetStringExtension("http://nu.nl", "then"); - nb.ElementId = "id1"; - b = nb; - b.Count.Should().Be(3); - b.Keys.Should().BeEquivalentTo("value", "id", "extension"); - b.Values.First().Should().BeOfType(); - b.Values.Skip(1).First().Should().BeOfType(); - b.Values.Skip(2).First().Should().BeAssignableTo>(); - - b.ToList()[2].Value.Should().BeAssignableTo>(); - - b.TryGetValue("id", out var v).Should().BeTrue(); - v.Should().Be("id1"); - b.TryGetValue("idX", out _).Should().BeFalse(); - } - - [TestMethod] - public void CanEnumerateCodedValue() - { - IReadOnlyDictionary b = new Code(Narrative.NarrativeStatus.Additional); - b.Should().BeEquivalentTo(new[] { KeyValuePair.Create("value", Narrative.NarrativeStatus.Additional.GetLiteral()) }); - } - - [TestMethod] - public void CanEnumerateNarrative() - { - IReadOnlyDictionary b = new Narrative("

bla

"); - b.Count.Should().Be(2); - b.Should().BeEquivalentTo(new[] { - KeyValuePair.Create("div", new XHtml("

bla

")), - KeyValuePair.Create("status", new Code(Narrative.NarrativeStatus.Generated)) }); - } - - [TestMethod] - public void CanEnumerateExtension() - { - // Explicitly test hand-written IROD implementation. - IReadOnlyDictionary b = new Extension("http://nu.nl", new FhirBoolean(true)); - b.Count.Should().Be(2); - b.Should().BeEquivalentTo(new[] { - KeyValuePair.Create("url", "http://nu.nl"), - KeyValuePair.Create("value", new FhirBoolean(true)) }); - - b.TryGetValue("valueString", out _).Should().BeFalse(); - b.TryGetValue("valueBoolean", out _).Should().BeFalse(); - b.TryGetValue("valueXXXXBoolean", out _).Should().BeFalse(); - b.TryGetValue("value", out var fb).Should().BeTrue(); - - fb.Should().BeOfType().Which.Value.Should().BeTrue(); - - b["value"].Should().BeOfType().Which.Value.Should().BeTrue(); - } - - [TestMethod] - public void HandlesChoiceElements() - { - IReadOnlyDictionary b = new Parameters.ParameterComponent() { Name = "test1", Value = new FhirBoolean(true) }; - - b.TryGetValue("valueString", out _).Should().BeFalse(); - b.TryGetValue("valueBoolean", out _).Should().BeFalse(); - b.TryGetValue("value", out var fb).Should().BeTrue(); - b.TryGetValue("valueXXXXBoolean", out _).Should().BeFalse(); - fb.Should().BeOfType().Which.Value.Should().BeTrue(); - - b["value"].Should().BeOfType().Which.Value.Should().BeTrue(); - } - - private OperationOutcome setupOutcome() - { - OperationOutcome oo = new OperationOutcome() - { - Id = "1", - Meta = new Meta { Profile = new[] { "http://simplifier.net/profiles/x" }, VersionId = "2" } - }; - - var fu = new FhirUri(); - fu.SetStringExtension("http://ha.nl", "hi"); - oo.Meta.ProfileElement.Add(fu); - - oo.Issue.Add( - new OperationOutcome.IssueComponent() - { - Code = OperationOutcome.IssueType.BusinessRule, - Details = new CodeableConcept("http://nu.nl", "then"), - Diagnostics = "This has low level information", - Expression = new[] { "Patient.x" }, - Severity = OperationOutcome.IssueSeverity.Error - }); - oo.Id = "1"; - - return oo; - } - - [TestMethod] - public void CanEnumerateResource() - { - IReadOnlyDictionary b = setupOutcome(); - b.Count.Should().Be(3); - b.TryGetValue("resourceType", out _).Should().BeFalse(); // we do not generate "resourceType" anymore - - // Check a backbone - IReadOnlyDictionary bb = b["issue"].Should().BeOfType>().Subject.Single(); - bb.Keys.Should().BeEquivalentTo("code", "details", "diagnostics", "expression", "severity"); - } - - [TestMethod] - public void CanEnumerateContainedResources() - { - IReadOnlyDictionary ps = new Parameters - { - { "aBool", new FhirBoolean(true) }, - { "aResource", new OperationOutcome() } - }; - - var paramList = ps["parameter"].Should().BeOfType>().Subject; - paramList.Count.Should().Be(2); - paramList[0].Name.Should().Be("aBool"); - paramList[1].Name.Should().Be("aResource"); - - ps = paramList[1]; - ps.TryGetValue("value", out _).Should().BeFalse(); - ps.TryGetValue("resource", out var r).Should().BeTrue(); - - var resource = ps["resource"].Should().BeAssignableTo>().Subject; - Assert.ThrowsException(() => resource["resourceType"]); - } } \ No newline at end of file diff --git a/src/Hl7.Fhir.Support.Poco.Tests/Model/TypedElementToPocoTests.cs b/src/Hl7.Fhir.Support.Poco.Tests/Model/TypedElementToPocoTests.cs index c940796321..ed8797dbb3 100644 --- a/src/Hl7.Fhir.Support.Poco.Tests/Model/TypedElementToPocoTests.cs +++ b/src/Hl7.Fhir.Support.Poco.Tests/Model/TypedElementToPocoTests.cs @@ -125,21 +125,21 @@ public void ParsesResourceWithOverflow() { var subject = new Patient(); - var subjectDict = subject.AsDictionary(); - subjectDict.Add("newField", new FhirString("hi")); - subjectDict.Add("newDynamicField", new DynamicPrimitive() { ObjectValue = "hi3" }); - subjectDict.Add("newListField", new List { new("hi1"), new("hi2") }); + subject.SetValue("newField", new FhirString("hi")); + subject.SetValue("newDynamicField", new DynamicPrimitive() { ObjectValue = "hi3" }); + subject.SetValue("newListField", new List { new("hi1"), new("hi2") }); - var dict = toPoco(subject).AsDictionary(); - dict.TryGetValue("newField", out var newField).Should().BeTrue(); + var subjectRt = toPoco(subject); + subjectRt.TryGetValue("newField", out var newField).Should().BeTrue(); newField.Should().BeOfType().Which.Value.Should().Be("hi"); - dict.TryGetValue("newDynamicField", out var newDynamicField).Should().BeTrue(); + subjectRt.TryGetValue("newDynamicField", out var newDynamicField).Should().BeTrue(); newDynamicField.Should().BeOfType().Which.ObjectValue.Should().Be("hi3"); - dict.TryGetValue("newListField", out var newListField).Should().BeTrue(); - newListField.Should().BeOfType>().Which.Should().BeEquivalentTo( - [new FhirString("hi1"), new FhirString("hi2")]); + subjectRt.TryGetValue("newListField", out var newListField).Should().BeTrue(); + newListField.Should().BeOfType>().Which + .IsExactly([new FhirString("hi1"), new FhirString("hi2")]) + .Should().BeTrue(); } private T toPoco(T source) where T : Base, new() diff --git a/src/Hl7.Fhir.Support.Poco.Tests/ModelFeaturesTest.cs b/src/Hl7.Fhir.Support.Poco.Tests/ModelFeaturesTest.cs index df41b246c1..b6582656dd 100644 --- a/src/Hl7.Fhir.Support.Poco.Tests/ModelFeaturesTest.cs +++ b/src/Hl7.Fhir.Support.Poco.Tests/ModelFeaturesTest.cs @@ -57,14 +57,15 @@ public void BuildCodingList() { ((DataType)null).ToCodings().Should().BeEmpty(); - new Code("bla").ToCodings().Should().BeEquivalentTo(l(c(null, "bla"))); - new Coding("http://nu.nl", "bla").ToCodings().Should().BeEquivalentTo(l(c("http://nu.nl", "bla"))); - new Code(AdministrativeGender.Male).ToCodings().Should().BeEquivalentTo(l(new Coding("http://hl7.org/fhir/administrative-gender", "male"))); - new CodeableConcept().Add("http://nu.nl", "bla1").Add("http://nu.nl", "bla2").ToCodings().Should().BeEquivalentTo( - [c("http://nu.nl", "bla1"), c("http://nu.nl", "bla2")]); - new FhirString("bla").ToCodings().Should().BeEquivalentTo(l(c(null, "bla"))); - new CodeableReference(new CodeableConcept().Add("http://nu.nl", "bla1")).ToCodings().Should() - .BeEquivalentTo([c("http://nu.nl", "bla1")]); + new Code("bla").ToCodings().IsExactly(l(c(null, "bla"))).Should().BeTrue(); + new Coding("http://nu.nl", "bla").ToCodings().IsExactly(l(c("http://nu.nl", "bla"))).Should().BeTrue(); + new Code(AdministrativeGender.Male).ToCodings() + .IsExactly(l(new Coding("http://hl7.org/fhir/administrative-gender", "male"))).Should().BeTrue(); + new CodeableConcept().Add("http://nu.nl", "bla1").Add("http://nu.nl", "bla2").ToCodings() + .IsExactly([c("http://nu.nl", "bla1"), c("http://nu.nl", "bla2")]).Should().BeTrue(); + new FhirString("bla").ToCodings().IsExactly(l(c(null, "bla"))).Should().BeTrue(); + new CodeableReference(new CodeableConcept().Add("http://nu.nl", "bla1")).ToCodings() + .IsExactly([c("http://nu.nl", "bla1")]).Should().BeTrue(); var list = new[] { @@ -72,7 +73,8 @@ public void BuildCodingList() new Code(AdministrativeGender.Other) }; - list.ToCodings().Should().BeEquivalentTo(new[] { c("http://hl7.org/fhir/administrative-gender", "male"), c("http://hl7.org/fhir/administrative-gender", "other") }); + list.ToCodings().IsExactly([c("http://hl7.org/fhir/administrative-gender", "male"), c("http://hl7.org/fhir/administrative-gender", "other") + ]).Should().BeTrue(); var listcc = new[] { @@ -80,8 +82,8 @@ public void BuildCodingList() new CodeableConcept().Add("http://nu.nl", "bla3").Add("http://nu.nl", "bla4"), }; - listcc.ToCodings().Should().BeEquivalentTo([c("http://nu.nl", "bla1"), c("http://nu.nl", "bla2"), c("http://nu.nl", "bla3"), c("http://nu.nl", "bla4") - ]); + listcc.ToCodings().IsExactly([c("http://nu.nl", "bla1"), c("http://nu.nl", "bla2"), c("http://nu.nl", "bla3"), c("http://nu.nl", "bla4") + ]).Should().BeTrue(); static Coding c(string s, string v) => new(s, v); static IEnumerable l(Coding c) => [c]; diff --git a/src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/FhirJsonDeserializationTests.cs b/src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/FhirJsonDeserializationTests.cs index dc0043eaca..37c24d6a0b 100644 --- a/src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/FhirJsonDeserializationTests.cs +++ b/src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/FhirJsonDeserializationTests.cs @@ -467,7 +467,7 @@ static void checkData(object parsedObject) var parsed = parsedObject.Should().BeOfType().Subject; parsed.Telecom.Count.Should().Be(2); parsed.Telecom[0].System.Should().Be(ContactPoint.ContactPointSystem.Phone); - parsed.Telecom[1].Count().Should().Be(0); + parsed.Telecom[1].GetElementPairs().Count().Should().Be(0); } } diff --git a/src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/SummaryFilterIntegrationTests.cs b/src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/SummaryFilterIntegrationTests.cs index 6f0eda32ca..b4a269e1c2 100644 --- a/src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/SummaryFilterIntegrationTests.cs +++ b/src/Hl7.Fhir.Support.Poco.Tests/NewPocoSerializers/SummaryFilterIntegrationTests.cs @@ -49,7 +49,7 @@ public void Basics() var filter = new BundleFilter(new TopLevelFilter( new ElementMetadataFilter { - IncludeNames = new[] { "communication", "type" }, + IncludeNames = ["communication", "type"], }, new ElementMetadataFilter { @@ -79,7 +79,7 @@ public void Basics() communication.Count().Should().Be(1); // Communication.language is a CodeableConcept, all of its field are in summary... - communication.Language.Should().BeEquivalentTo(new CodeableConcept("x", "nl-nl")); + communication.Language.IsExactly(new CodeableConcept("x", "nl-nl")).Should().BeTrue(); // The nested Bundle should only its "type" present var nb = bp.Entry[1].Resource as Bundle; @@ -104,11 +104,11 @@ static void assertIdentifier(Identifier ide) [TestMethod] public void AllSummaryIndeed() { - var (full, summarized) = runSummarize("mask-text.xml", SerializationFilter.ForSummary()); - var codeSystemCM = ModelInspector.ForAssembly(typeof(Patient).Assembly).FindClassMapping(typeof(CodeSystem)); + var (_, summarized) = runSummarize("mask-text.xml", SerializationFilter.ForSummary()); + var codeSystemCm = ModelInspector.ForAssembly(typeof(Patient).Assembly).FindClassMapping(typeof(CodeSystem))!; - summarized.All(element => codeSystemCM.FindMappedElementByName(element.Key).InSummary).Should().BeTrue(); - summarized.Count().Should().BeLessThan(codeSystemCM.PropertyMappings.Where(pm => pm.InSummary).Count()); + summarized.GetElementPairs().All(element => codeSystemCm.FindMappedElementByName(element.Key)!.InSummary).Should().BeTrue(); + summarized.Count().Should().BeLessThan(codeSystemCm.PropertyMappings.Count(pm => pm.InSummary)); } [TestMethod] @@ -135,7 +135,8 @@ public void SummaryData() public void SummaryElements() { // This is actually equivalent to "text" (if elements also includes mandatory) - var (full, summarized) = runSummarize("mask-text.xml", SerializationFilter.ForElements(new[] { "id", "text", "meta" })); + var (full, summarized) = runSummarize("mask-text.xml", SerializationFilter.ForElements(["id", "text", "meta" + ])); traverse(summarized).Count().Should().Be(1 + traverse(full.IdElement).Count() + @@ -147,7 +148,7 @@ public void SummaryElements() [TestMethod] public void SummaryCount() { - var (full, summarized) = runSummarize("simple-bundle.xml", SerializationFilter.ForCount()); + var (_, summarized) = runSummarize("simple-bundle.xml", SerializationFilter.ForCount()); // check if result contains the link traverse(summarized).Should().ContainKey("link"); @@ -176,10 +177,14 @@ static IEnumerable> childrenAndMe(KeyValuePair array.Cast().SelectMany(bsi => childrenAndMe(KeyValuePair.Create(y.Key, bsi))), - Base obj => obj.SelectMany(oc => childrenAndMe(oc)), - var z => Enumerable.Empty>() + Base obj => obj.GetElementPairs().SelectMany(childrenAndMe), + _ => [] }).Prepend(y).ToList(); } } + file static class EnumerableShim + { + public static int Count(this Base b) => b.GetElementPairs().Count(); + } } \ No newline at end of file diff --git a/src/Hl7.Fhir.Support.Tests/Serialization/TestDictionaryImplementation.cs b/src/Hl7.Fhir.Support.Tests/Serialization/TestDictionaryImplementation.cs new file mode 100644 index 0000000000..54c4ea99bd --- /dev/null +++ b/src/Hl7.Fhir.Support.Tests/Serialization/TestDictionaryImplementation.cs @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2021, Firely (info@fire.ly) and contributors + * See the file CONTRIBUTORS for details. + * + * This file is licensed under the BSD 3-Clause license + * available at https://raw.githubusercontent.com/FirelyTeam/firely-net-sdk/master/LICENSE + */ + +using FluentAssertions; +using Hl7.Fhir.Model; +using Hl7.Fhir.Utility; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Collections.Generic; +using System.Linq; + +namespace Hl7.Fhir.Support.Tests.Serialization; + +[TestClass] +public class TestDictionaryImplementation +{ + [TestMethod] + public void CanEnumerateFhirPrimitive() + { + var b = new FhirBoolean(null).GetElementList(); + b.Any().Should().Be(false); + + b = new FhirBoolean(true).GetElementList(); + b.Count.Should().Be(1); + b.First().Should().BeEquivalentTo(KeyValuePair.Create("value", true)); + + var nb = new FhirBoolean(true); + nb.SetStringExtension("http://nu.nl", "then"); + nb.ElementId = "id1"; + + b = nb.GetElementList(); + b.Count.Should().Be(3); + b.Select(kvp => kvp.Key).Should().BeEquivalentTo("value", "id", "extension"); + var values = b.Select(kvp => kvp.Value).ToList(); + values.First().Should().BeOfType(); + values.Skip(1).First().Should().BeOfType(); + values.Skip(2).First().Should().BeAssignableTo>(); + b[2].Value.Should().BeAssignableTo>(); + + nb.TryGetValue("id", out var v).Should().BeTrue(); + v.Should().Be("id1"); + nb.TryGetValue("idX", out _).Should().BeFalse(); + } + + [TestMethod] + public void CanEnumerateCodedValue() + { + var b = new Code(Narrative.NarrativeStatus.Additional).GetElementList(); + b.Should().BeEquivalentTo(new[] { KeyValuePair.Create("value", Narrative.NarrativeStatus.Additional.GetLiteral()) }); + } + + [TestMethod] + public void CanEnumerateNarrative() + { + var b = new Narrative("

bla

").GetElementList(); + b.Count.Should().Be(2); + + b[0].Key.Should().Be("status"); + b[0].Value.Should().BeOfType>().Which.Value.Should().Be(Narrative.NarrativeStatus.Generated); + + b[1].Key.Should().Be("div"); + b[1].Value.Should().BeOfType().Which.Value.Should().Be("

bla

"); + } + + [TestMethod] + public void CanEnumerateExtension() + { + // Explicitly test hand-written IROD implementation. + var ext = new Extension("http://nu.nl", new FhirBoolean(true)); + var b = ext.GetElementList(); + b.Count.Should().Be(2); + b[0].Should().Be(KeyValuePair.Create("url", "http://nu.nl")); + b[1].Key.Should().Be("value"); + b[1].Value.Should().BeOfType().Which.Value.Should().BeTrue(); + + ext.TryGetValue("valueString", out _).Should().BeFalse(); + ext.TryGetValue("valueBoolean", out _).Should().BeFalse(); + ext.TryGetValue("valueXXXXBoolean", out _).Should().BeFalse(); + ext.TryGetValue("value", out var fb).Should().BeTrue(); + + fb.Should().BeOfType().Which.Value.Should().BeTrue(); + + ext["value"].Should().BeOfType().Which.Value.Should().BeTrue(); + } + + [TestMethod] + public void HandlesChoiceElements() + { + var b = new Parameters.ParameterComponent { Name = "test1", Value = new FhirBoolean(true) }; + + b.TryGetValue("valueString", out _).Should().BeFalse(); + b.TryGetValue("valueBoolean", out _).Should().BeFalse(); + b.TryGetValue("value", out var fb).Should().BeTrue(); + b.TryGetValue("valueXXXXBoolean", out _).Should().BeFalse(); + fb.Should().BeOfType().Which.Value.Should().BeTrue(); + + b["value"].Should().BeOfType().Which.Value.Should().BeTrue(); + } + + private OperationOutcome setupOutcome() + { + OperationOutcome oo = new() + { + Id = "1", + Meta = new Meta { Profile = ["http://simplifier.net/profiles/x"], VersionId = "2" } + }; + + var fu = new FhirUri(); + fu.SetStringExtension("http://ha.nl", "hi"); + oo.Meta.ProfileElement.Add(fu); + + oo.Issue.Add( + new OperationOutcome.IssueComponent() + { + Code = OperationOutcome.IssueType.BusinessRule, + Details = new CodeableConcept("http://nu.nl", "then"), + Diagnostics = "This has low level information", + Expression = ["Patient.x"], + Severity = OperationOutcome.IssueSeverity.Error + }); + oo.Id = "1"; + + return oo; + } + + [TestMethod] + public void CanEnumerateResource() + { + var b = setupOutcome(); + b.GetElementList().Count.Should().Be(3); + b.TryGetValue("resourceType", out _).Should().BeFalse(); // we do not generate "resourceType" anymore + + // Check a backbone + var bb = b["issue"].Should().BeOfType>() + .Subject.Single(); + bb.GetElementList().Select(kvp => kvp.Key) + .Should().BeEquivalentTo("code", "details", "diagnostics", "expression", "severity"); + } + + [TestMethod] + public void CanEnumerateContainedResources() + { + var parameters = new Parameters(); + parameters.Add("aBool", new FhirBoolean(true)); + parameters.Add("aResource", new OperationOutcome()); + + var paramList = parameters["parameter"].Should().BeOfType>().Subject; + paramList.Count.Should().Be(2); + paramList[0].Name.Should().Be("aBool"); + paramList[1].Name.Should().Be("aResource"); + + var ps = paramList[1]; + ps.TryGetValue("value", out _).Should().BeFalse(); + ps.TryGetValue("resource", out var r).Should().BeTrue(); + + var resource = ps["resource"].Should().BeAssignableTo().Subject; + Assert.ThrowsException(() => resource["resourceType"]); + } +} + +file static class TestDictionaryHelpers +{ + public static List> GetElementList(this Base b) => b.GetElementPairs().ToList(); +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Support.Tests/Specification/LanguageTerminologyServiceTests.cs b/src/Hl7.Fhir.Support.Tests/Specification/LanguageTerminologyServiceTests.cs index cf82805c3c..281efa1bdc 100644 --- a/src/Hl7.Fhir.Support.Tests/Specification/LanguageTerminologyServiceTests.cs +++ b/src/Hl7.Fhir.Support.Tests/Specification/LanguageTerminologyServiceTests.cs @@ -25,7 +25,8 @@ public async Task LanguageValidationTest() var result = await _service.ValueSetValidateCode(parameters); result.Parameter.Should().Contain(p => p.Name == "message") - .Subject.Value.Should().BeEquivalentTo(new FhirString($"'ned' is not a valid language.")); + .Subject.Value.IsExactly(new FhirString($"'ned' is not a valid language.")) + .Should().BeTrue(); parameters = new ValidateCodeParameters() @@ -35,7 +36,8 @@ public async Task LanguageValidationTest() result = await _service.ValueSetValidateCode(parameters); result.Parameter.Should().Contain(p => p.Name == "result") - .Subject.Value.Should().BeEquivalentTo(new FhirBoolean(true)); + .Subject.Value.IsExactly(new FhirBoolean(true)) + .Should().BeTrue(); parameters = new ValidateCodeParameters() .WithValueSet(LANGUAGE_VS) @@ -44,7 +46,8 @@ public async Task LanguageValidationTest() result = await _service.ValueSetValidateCode(parameters); result.Parameter.Should().Contain(p => p.Name == "result") - .Subject.Value.Should().BeEquivalentTo(new FhirBoolean(true)); + .Subject.Value.IsExactly(new FhirBoolean(true)).Should() + .BeTrue(); parameters = new ValidateCodeParameters() .WithValueSet(ADMINGENDERVS) @@ -70,4 +73,4 @@ public async Task LanguageValidationTest() await validateCode.Should().ThrowAsync().WithMessage("Unknown system 'http://hl7.org/fhir/administrative-gender'"); } } -} +} \ No newline at end of file diff --git a/src/Hl7.Fhir.Support.Tests/Specification/MimeTypeTerminologyServiceTests.cs b/src/Hl7.Fhir.Support.Tests/Specification/MimeTypeTerminologyServiceTests.cs index 95e2d79fa8..de74116530 100644 --- a/src/Hl7.Fhir.Support.Tests/Specification/MimeTypeTerminologyServiceTests.cs +++ b/src/Hl7.Fhir.Support.Tests/Specification/MimeTypeTerminologyServiceTests.cs @@ -27,7 +27,8 @@ public async Task MimeTypeValidationTest() var result = await _service.ValueSetValidateCode(parameters); result.Parameter.Should().Contain(p => p.Name == "message") - .Subject.Value.Should().BeEquivalentTo(new FhirString($"'invalid' is not a valid MIME type.")); + .Subject.Value.IsExactly(new FhirString($"'invalid' is not a valid MIME type.")) + .Should().BeTrue(); parameters = new ValidateCodeParameters() @@ -37,7 +38,8 @@ public async Task MimeTypeValidationTest() result = await _service.ValueSetValidateCode(parameters); result.Parameter.Should().Contain(p => p.Name == "result") - .Subject.Value.Should().BeEquivalentTo(new FhirBoolean(true)); + .Subject.Value.IsExactly(new FhirBoolean(true)) + .Should().BeTrue(); parameters = new ValidateCodeParameters() .WithValueSet(ADMINGENDERVS) @@ -75,8 +77,8 @@ public async Task MimeTypeValidationAlternativeValueSet(string valueset) var result = await _service.ValueSetValidateCode(parameters); result.Parameter.Should().Contain(p => p.Name == "message") - .Subject.Value.Should().BeEquivalentTo(new FhirString($"'invalid' is not a valid MIME type.")); - + .Subject.Value.IsExactly(new FhirString($"'invalid' is not a valid MIME type.")) + .Should().BeTrue(); parameters = new ValidateCodeParameters() .WithValueSet(valueset) @@ -85,7 +87,8 @@ public async Task MimeTypeValidationAlternativeValueSet(string valueset) result = await _service.ValueSetValidateCode(parameters); result.Parameter.Should().Contain(p => p.Name == "result") - .Subject.Value.Should().BeEquivalentTo(new FhirBoolean(true)); + .Subject.Value.IsExactly(new FhirBoolean(true)) + .Should().BeTrue(); } } -} +} \ No newline at end of file diff --git a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathTest.cs b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathTest.cs index 3994e7fa6d..60eeb68666 100644 --- a/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathTest.cs +++ b/src/Hl7.FhirPath.R4.Tests/PocoTests/FhirPathTest.cs @@ -413,7 +413,7 @@ public void MemberOfTestWithExampleFromSpecification() result.Should().ContainSingle().Subject .Should().BeOfType() - .Subject.Code.Should().BeEquivalentTo(new CodeableConcept("http://loinc.org", "2708-6")); + .Subject.Code.IsExactly(new CodeableConcept("http://loinc.org", "2708-6")).Should().BeTrue(); } } } \ No newline at end of file