Skip to content
This repository was archived by the owner on Jul 8, 2024. It is now read-only.

TryGetFhirReleaseFromCorePackageName now returns correct result #102

Merged
merged 1 commit into from
Mar 22, 2021
Merged

TryGetFhirReleaseFromCorePackageName now returns correct result #102

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
23 changes: 18 additions & 5 deletions src/Hl7.Fhir.Support.Poco/Utility/FhirVersionUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public static string FhirVersionFromRelease(FhirRelease fhirRelease)
/// <returns>Official FHIR Release</returns>
public static FhirRelease FhirReleaseFromMimeVersion(string fhirMimeVersion)
{
if (TryFhirReleaseFromMimeVersion(fhirMimeVersion, out var release))
if (TryGetFhirReleaseFromMimeVersion(fhirMimeVersion, out var release))
{
return release.Value;
}
Expand All @@ -106,7 +106,7 @@ public static FhirRelease FhirReleaseFromMimeVersion(string fhirMimeVersion)
/// <param name="fhirMimeVersion">'fhirversion' MIME-Type parameter</param>
/// <param name="release">Official FHIR Release</param>
/// <returns>true if the conversion succeeded; false otherwise.</returns>
public static bool TryFhirReleaseFromMimeVersion(string fhirMimeVersion, out FhirRelease? release)
public static bool TryGetFhirReleaseFromMimeVersion(string fhirMimeVersion, out FhirRelease? release)
{
release = fhirMimeVersion switch
{
Expand All @@ -120,6 +120,12 @@ public static bool TryFhirReleaseFromMimeVersion(string fhirMimeVersion, out Fhi
return release != null;
}

[Obsolete("This method is obsolete. Use TryGetFhirReleaseFromMimeVersion instead")]
public static bool TryFhirReleaseFromMimeVersion(string fhirMimeVersion, out FhirRelease? release)
{
return TryGetFhirReleaseFromMimeVersion(fhirMimeVersion, out release);
}

/// <summary>
/// Returns the value of the 'fhirversion' MIME-type parameter corresponding to a specific FHIR Version
/// </summary>
Expand All @@ -145,7 +151,7 @@ public static string MimeVersionFromFhirRelease(FhirRelease fhirRelease)
/// <returns>Official FHIR Release</returns>
public static FhirRelease FhirReleaseFromCorePackageName(string packageName)
{
if (TryFhirReleaseFromCorePackageName(packageName, out var release))
if (TryGetFhirReleaseFromCorePackageName(packageName, out var release))
{
return release.Value;
}
Expand All @@ -161,7 +167,7 @@ public static FhirRelease FhirReleaseFromCorePackageName(string packageName)
/// <param name="packageName">FHIR Core package name</param>
/// <param name="release">Official FHIR Release</param>
/// <returns>true if the conversion succeeded; false otherwise</returns>
public static bool TryFhirReleaseFromCorePackageName(string packageName, out FhirRelease? release)
public static bool TryGetFhirReleaseFromCorePackageName(string packageName, out FhirRelease? release)
{
release = packageName switch
{
Expand All @@ -170,9 +176,16 @@ public static bool TryFhirReleaseFromCorePackageName(string packageName, out Fhi
"hl7.fhir.r5.core" => FhirRelease.R5,
_ => null
};
return packageName != null;
return release != null;
}

[Obsolete("This method is obsolete. Use TryGetFhirReleaseFromCorePackageName instead")]
public static bool TryFhirReleaseFromCorePackageName(string packageName, out FhirRelease? release)
{
return TryGetFhirReleaseFromCorePackageName(packageName, out release);
}



/// <summary>
/// Returns the corresponding FHIR core package of the specific FHIR Release version
Expand Down
21 changes: 11 additions & 10 deletions src/Hl7.Fhir.Support.Tests/Utility/FhirVersionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,18 @@ public void TestsFhirVersionFromMimeVersion()
public void TestTryFhirVersionFromMimeVersion()
{
FhirRelease? version = null;
Assert.AreEqual(true, FhirReleaseParser.TryFhirReleaseFromMimeVersion("0.0", out version));
Assert.AreEqual(true, FhirReleaseParser.TryGetFhirReleaseFromMimeVersion("0.0", out version));
Assert.AreEqual(FhirRelease.DSTU1, version);
Assert.AreEqual(true, FhirReleaseParser.TryFhirReleaseFromMimeVersion("1.0", out version));
Assert.AreEqual(true, FhirReleaseParser.TryGetFhirReleaseFromMimeVersion("1.0", out version));
Assert.AreEqual(FhirRelease.DSTU2, version);
Assert.AreEqual(true, FhirReleaseParser.TryFhirReleaseFromMimeVersion("3.0", out version));
Assert.AreEqual(true, FhirReleaseParser.TryGetFhirReleaseFromMimeVersion("3.0", out version));
Assert.AreEqual(FhirRelease.STU3, version);
Assert.AreEqual(true, FhirReleaseParser.TryFhirReleaseFromMimeVersion("4.0", out version));
Assert.AreEqual(true, FhirReleaseParser.TryGetFhirReleaseFromMimeVersion("4.0", out version));
Assert.AreEqual(FhirRelease.R4, version);
Assert.AreEqual(true, FhirReleaseParser.TryFhirReleaseFromMimeVersion("5.0", out version));
Assert.AreEqual(true, FhirReleaseParser.TryGetFhirReleaseFromMimeVersion("5.0", out version));
Assert.AreEqual(FhirRelease.R5, version);

Assert.AreEqual(false, FhirReleaseParser.TryFhirReleaseFromMimeVersion("0.0.0.0.1", out version));
Assert.AreEqual(false, FhirReleaseParser.TryGetFhirReleaseFromMimeVersion("0.0.0.0.1", out version));
Assert.IsNull(version);
}

Expand All @@ -120,15 +120,16 @@ public void FhirReleaseFromCorePackageName()
public void TestTryFhirReleaseFromCorePackageName()
{
FhirRelease? version = null;
Assert.AreEqual(true, FhirReleaseParser.TryFhirReleaseFromCorePackageName("hl7.fhir.r3.core", out version));
Assert.AreEqual(true, FhirReleaseParser.TryGetFhirReleaseFromCorePackageName("hl7.fhir.r3.core", out version));
Assert.AreEqual(FhirRelease.STU3, version);
Assert.AreEqual(true, FhirReleaseParser.TryFhirReleaseFromCorePackageName("hl7.fhir.r4.core", out version));
Assert.AreEqual(true, FhirReleaseParser.TryGetFhirReleaseFromCorePackageName("hl7.fhir.r4.core", out version));
Assert.AreEqual(FhirRelease.R4, version);
Assert.AreEqual(true, FhirReleaseParser.TryFhirReleaseFromCorePackageName("hl7.fhir.r5.core", out version));
Assert.AreEqual(true, FhirReleaseParser.TryGetFhirReleaseFromCorePackageName("hl7.fhir.r5.core", out version));
Assert.AreEqual(FhirRelease.R5, version);

Assert.AreEqual(false, FhirReleaseParser.TryFhirReleaseFromMimeVersion("hl7.fhir.core.r3", out version));
Assert.AreEqual(false, FhirReleaseParser.TryGetFhirReleaseFromCorePackageName("hl7.fhir.core.r3", out version));
Assert.IsNull(version);

}


Expand Down