honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes for https://github.com/hapifhir/hapi-fhir/issues/4277 and https… (#4291) 

* fixes for https://github.com/hapifhir/hapi-fhir/issues/4277 and https://github.com/hapifhir/hapi-fhir/issues/4276

* Credit for #4291

Co-authored-by: James Agnew <jamesagnew@gmail.com>
This commit is contained in:
Jens Kristian Villadsen 2022-11-18 01:15:05 +01:00 committed by GitHub
parent 6c4283e930
commit 61579aae7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java
View File

@ -309,6 +309,8 @@ public enum FhirVersionEnum {
return FhirVersionEnum.DSTU3; return FhirVersionEnum.DSTU3;
case "R4": case "R4":
return FhirVersionEnum.R4; return FhirVersionEnum.R4;
case "R4B":
return FhirVersionEnum.R4B;
case "R5": case "R5":
return FhirVersionEnum.R5; return FhirVersionEnum.R5;
} }

3
hapi-fhir-base/src/test/java/ca/uhn/fhir/context/FhirVersionEnumTest.java
View File

@ -19,8 +19,11 @@ public class FhirVersionEnumTest {
assertEquals(FhirVersionEnum.R4, FhirVersionEnum.forVersionString("4.0.0")); assertEquals(FhirVersionEnum.R4, FhirVersionEnum.forVersionString("4.0.0"));
assertEquals(FhirVersionEnum.R4, FhirVersionEnum.forVersionString("4.0.1")); assertEquals(FhirVersionEnum.R4, FhirVersionEnum.forVersionString("4.0.1"));
assertEquals(FhirVersionEnum.R4, FhirVersionEnum.forVersionString("R4")); assertEquals(FhirVersionEnum.R4, FhirVersionEnum.forVersionString("R4"));
assertEquals(FhirVersionEnum.R4B, FhirVersionEnum.forVersionString("R4B"));
assertEquals(FhirVersionEnum.R4B, FhirVersionEnum.forVersionString("4.3.0"));
assertEquals(FhirVersionEnum.R5, FhirVersionEnum.forVersionString("R5")); assertEquals(FhirVersionEnum.R5, FhirVersionEnum.forVersionString("R5"));
} }

5
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_3_0/4291-r4b-package-install.yaml Normal file
View File

@ -0,0 +1,5 @@
---
type: add
issue: 4291
title: "The NPM package installer did not support installing on R4B repositories. Thanks to Jens Kristian Villadsen
for the pull request!"

1
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcImpl.java
View File

@ -128,6 +128,7 @@ public class PackageInstallerSvcImpl implements IPackageInstallerSvc {
public void initialize() { public void initialize() {
switch (myFhirContext.getVersion().getVersion()) { switch (myFhirContext.getVersion().getVersion()) {
case R5: case R5:
case R4B:
case R4: case R4:
case DSTU3: case DSTU3:
break; break;