Skip to content

#2977 Added support for separate valueset version #3022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2025
Merged

#2977 Added support for separate valueset version #3022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Hl7.Fhir.Base/Model/Canonical.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ public Canonical(Uri uri) : this(uri?.OriginalString)
/// <summary>
/// Constructs a canonical from its components.
/// </summary>
public Canonical(string? uri, string? version, string? fragment)
public Canonical(string? uri, string? version, string? fragment = null)
{
if (uri == null) throw Error.ArgumentNull(nameof(uri));
if (uri.IndexOfAny(new[] { '|', '#' }) != -1)
if (uri.IndexOfAny(['|', '#']) != -1)
throw Error.Argument(nameof(uri), "cannot contain version/fragment data");

if (version != null && version.IndexOfAny(new[] { '|', '#' }) != -1)
if (version != null && version.IndexOfAny(['|', '#']) != -1)
throw Error.Argument(nameof(version), "cannot contain version/fragment data");

if (fragment != null && fragment.IndexOfAny(new[] { '|', '#' }) != -1)
if (fragment != null && fragment.IndexOfAny(['|', '#']) != -1)
throw Error.Argument(nameof(fragment), "already contains version/fragment data");


Expand Down
221 changes: 106 additions & 115 deletions src/Hl7.Fhir.Base/Model/Parameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,152 +28,143 @@ POSSIBILITY OF SUCH DAMAGE.

*/

#nullable enable


//using Hl7.Fhir.Introspection;
using Hl7.Fhir.Utility;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;

namespace Hl7.Fhir.Model
namespace Hl7.Fhir.Model;

/// <summary>
/// This is the Parameters partial class that adds all the specific functionality of a Parameters to the model
/// </summary>
[DebuggerDisplay(@"\{Count={_Parameter != null ? _Parameter.Count : 0}}")]
public partial class Parameters
{
/// <summary>
/// This is the Parameters partial class that adds all the specific functionality of a Parameters to the model
/// Add a parameter with a given name and value.
/// </summary>
[System.Diagnostics.DebuggerDisplay(@"\{Count={_Parameter != null ? _Parameter.Count : 0}}")]
public partial class Parameters
/// <param name="name">The name of the parameter</param>
/// <param name="value">The value of the parameter as a FHIR datatype or Resource</param>
/// <returns>this (Parameters), so you can chain AddParameter calls</returns>
public Parameters Add(string name, Base? value)
{
/// <summary>
/// Add a parameter with a given name and value.
/// </summary>
/// <param name="name">The name of the parameter</param>
/// <param name="value">The value of the parameter as a FHIR datatype or Resource</param>
/// <returns>this (Parameters), so you can chain AddParameter calls</returns>
public Parameters Add(string name, Base value)
if (name == null) throw new ArgumentNullException(nameof(name));

if (value != null)
{
if (name == null) throw new ArgumentNullException(nameof(name));
Parameter.Add(
new ParameterComponent()
{
Name = name,
Value = value as DataType,
Resource = value as Resource
});
}

if (value != null)
{
Parameter.Add(
new ParameterComponent()
{
Name = name,
Value = value as DataType,
Resource = value as Resource
});
}
return this;
}

return this;
}

/// <summary>
/// Add a parameter with a given name and tuple value.
/// </summary>
/// <param name="name">The name of the parameter</param>
/// <param name="tuples">The value of the parameter as a list of tuples of (name,FHIR datatype or Resource)</param>
/// <returns>this (Parameters), so you can chain AddParameter calls</returns>
public Parameters Add(string name, IEnumerable<Tuple<string, Base>> tuples)
{
if (name == null) throw new ArgumentNullException(nameof(name));
if (tuples == null) throw new ArgumentNullException(nameof(tuples));

/// <summary>
/// Add a parameter with a given name and tuple value.
/// </summary>
/// <param name="name">The name of the parameter</param>
/// <param name="tuples">The value of the parameter as a list of tuples of (name,FHIR datatype or Resource)</param>
/// <returns>this (Parameters), so you can chain AddParameter calls</returns>
public Parameters Add(string name, IEnumerable<Tuple<string, Base>> tuples)
{
if (name == null) throw new ArgumentNullException("name");
if (tuples == null) throw new ArgumentNullException("tuples");
var newParam = new ParameterComponent() { Name = name };

var newParam = new ParameterComponent() { Name = name };
foreach (var tuple in tuples)
{
var newPart = new ParameterComponent() { Name = tuple.Item1 };
newParam.Part.Add(newPart);

foreach (var tuple in tuples)
if (tuple.Item2 is DataType dt)
newPart.Value = dt;
else
{
var newPart = new ParameterComponent() { Name = tuple.Item1 };
newParam.Part.Add(newPart);

if (tuple.Item2 is DataType dt)
newPart.Value = dt;
else
{
//TODO: Due to an error in the jan2015 version of DSTU2, this is not yet possible
//newPart.Resource = (Resource)tuple.Item2;
throw Error.NotImplemented("Jan 2015 DSTU2 does not support resource values for tuples parameters");
}
//TODO: Due to an error in the jan2015 version of DSTU2, this is not yet possible
//newPart.Resource = (Resource)tuple.Item2;
throw Error.NotImplemented("Jan 2015 DSTU2 does not support resource values for tuples parameters");
}
}

Parameter.Add(newParam);
Parameter.Add(newParam);

return this;
}
return this;
}


/// <summary>
/// Remove a parameter with a given name.
/// </summary>
/// <param name="name">The name of the parameter</param>
/// <param name="matchPrefix">If true, will remove all parameters which begin with the string given in the "name" parameter</param>
/// <remarks>No exception is thrown when the parameters were not found and nothing was removed.</remarks>
public void Remove(string name, bool matchPrefix = false)
{
if (name == null) throw new ArgumentNullException("name");
/// <summary>
/// Remove a parameter with a given name.
/// </summary>
/// <param name="name">The name of the parameter</param>
/// <param name="matchPrefix">If true, will remove all parameters which begin with the string given in the "name" parameter</param>
/// <remarks>No exception is thrown when the parameters were not found and nothing was removed.</remarks>
public void Remove(string name, bool matchPrefix = false)
{
if (name == null) throw new ArgumentNullException(nameof(name));

foreach (var hit in Get(name, matchPrefix).ToList()) Parameter.Remove(hit);
}
foreach (var hit in Get(name, matchPrefix).ToList()) Parameter.Remove(hit);
}


/// <summary>
/// Searches for a parameter with the given name, and returns the matching parameter(s)
/// </summary>
/// <param name="name">The name of the parameter</param>
/// <param name="matchPrefix">If true, will retrieve all parameters which begin with the string given in the "name" parameter</param>
public IEnumerable<ParameterComponent> Get(string name, bool matchPrefix = false)
{
if (name == null) throw new ArgumentNullException("name");
/// <summary>
/// Searches for a parameter with the given name, and returns the matching parameter(s)
/// </summary>
/// <param name="name">The name of the parameter</param>
/// <param name="matchPrefix">If true, will retrieve all parameters which begin with the string given in the "name" parameter</param>
public IEnumerable<ParameterComponent> Get(string name, bool matchPrefix = false)
{
if (name == null) throw new ArgumentNullException(nameof(name));

if (matchPrefix)
return Parameter.Where(p => p.Name.StartsWith(name)).ToList();
else
return Parameter.Where(p => p.Name == name).ToList();
}
if (matchPrefix)
return Parameter.Where(p => p.Name.StartsWith(name)).ToList();
else
return Parameter.Where(p => p.Name == name).ToList();
}

/// <summary>
/// Searches for a parameter with the given name, and returns the matching parameter(s)
/// </summary>
/// <param name="name">The name of the parameter</param>
/// <param name="matchPrefix">If true, will retrieve all parameters which begin with the string given in the "name" parameter</param>
public ParameterComponent GetSingle(string name, bool matchPrefix = false)
{
if (name == null) throw new ArgumentNullException("name");
/// <summary>
/// Searches for a parameter with the given name, and returns the matching parameter(s)
/// </summary>
/// <param name="name">The name of the parameter</param>
/// <param name="matchPrefix">If true, will retrieve all parameters which begin with the string given in the "name" parameter</param>
public ParameterComponent? GetSingle(string name, bool matchPrefix = false)
{
if (name == null) throw new ArgumentNullException(nameof(name));

return Get(name, matchPrefix).SingleOrDefault();
}
return Get(name, matchPrefix).SingleOrDefault();
}

public ParameterComponent this[string name] => GetSingle(name);
public ParameterComponent? this[string name] => GetSingle(name);

/// <summary>
/// Returns the Value property of the requested parameter casted to the requested type
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="name"></param>
/// <param name="matchPrefix"></param>
/// <returns></returns>
public T GetSingleValue<T>(string name, bool matchPrefix = false) where T : Element
{
if (name == null) throw new ArgumentNullException("name");
ParameterComponent p = Get(name, matchPrefix).SingleOrDefault();
if (p == null)
return null;
return p.Value as T;
}
/// <summary>
/// Returns the Value property of the requested parameter casted to the requested type
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="name"></param>
/// <param name="matchPrefix"></param>
/// <returns></returns>
public T? GetSingleValue<T>(string name, bool matchPrefix = false) where T : Element
{
if (name == null) throw new ArgumentNullException(nameof(name));

[System.Diagnostics.DebuggerDisplay(@"\{{DebuggerDisplay,nq}}")] // http://blogs.msdn.com/b/jaredpar/archive/2011/03/18/debuggerdisplay-attribute-best-practices.aspx
public partial class ParameterComponent
{
[DebuggerBrowsable(DebuggerBrowsableState.Never)]
private string DebuggerDisplay
{
get
{
return String.Format("Name=\"{0}\" Value=\"{1}\"", this.Name, this.Value);
}
}
}
var p = Get(name, matchPrefix).SingleOrDefault();
return p?.Value as T;
}

[DebuggerDisplay(@"\{{DebuggerDisplay,nq}}")] // http://blogs.msdn.com/b/jaredpar/archive/2011/03/18/debuggerdisplay-attribute-best-practices.aspx
public partial class ParameterComponent
{
[DebuggerBrowsable(DebuggerBrowsableState.Never)]
private string DebuggerDisplay => $"Name=\"{this.Name}\" Value=\"{this.Value}\"";
}
}
}
Loading
Loading