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

Refactor: Use useful and consistent parameter names

This commit is contained in:
dotasek 2023-05-08 14:09:31 -04:00
parent 9ca316bb2f
commit c4e32f87c2
30 changed files with 324 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/VersionConvertor_10_30.java
View File

@ -128,15 +128,17 @@ public class VersionConvertor_10_30 {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.dstu2.model.Element src,
@Nonnull org.hl7.fhir.dstu3.model.Element tgt, String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_30.INSTANCE.path(), var);
public void copyElement(
@Nonnull org.hl7.fhir.dstu2.model.Element src,
@Nonnull org.hl7.fhir.dstu3.model.Element tgt, String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_30.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.dstu3.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.dstu3.model.Element src,
@Nonnull org.hl7.fhir.dstu2.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_30.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_30.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.dstu3.model.DomainResource src,

14
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/datatypes10_30/BackboneElement10_30.java
View File

@ -4,19 +4,21 @@ import org.hl7.fhir.convertors.context.ConversionContext10_30;
import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement10_30 {
static public void copyBackboneElement(org.hl7.fhir.dstu2.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.dstu2.model.BackboneElement src,
org.hl7.fhir.dstu3.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext10_30.INSTANCE.getVersionConvertor_10_30().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext10_30.INSTANCE.getVersionConvertor_10_30().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu2.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension10_30.convertExtension(e));
}
}
static public void copyBackboneElement(org.hl7.fhir.dstu3.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.dstu3.model.BackboneElement src,
org.hl7.fhir.dstu2.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext10_30.INSTANCE.getVersionConvertor_10_30().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext10_30.INSTANCE.getVersionConvertor_10_30().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu3.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension10_30.convertExtension(e));
}

12
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/datatypes10_30/Element10_30.java
View File

@ -14,17 +14,17 @@ public class Element10_30 {
this.advisor = advisor;
}
public boolean isExemptExtension(String url, String[] extensionsToIgnore) {
return Arrays.asList(extensionsToIgnore).contains(url);
public boolean isExemptExtension(String url, String[] extensionUrlsToIgnore) {
return Arrays.asList(extensionUrlsToIgnore).contains(url);
}
public void copyElement(org.hl7.fhir.dstu2.model.Element src,
org.hl7.fhir.dstu3.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.dstu3.model.Extension convertedExtension = new org.hl7.fhir.dstu3.model.Extension();
@ -39,10 +39,10 @@ public class Element10_30 {
public void copyElement(org.hl7.fhir.dstu3.model.Element src,
org.hl7.fhir.dstu2.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.dstu2.model.Extension convertedExtension = new org.hl7.fhir.dstu2.model.Extension();

12
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/VersionConvertor_10_40.java
View File

@ -159,20 +159,20 @@ public class VersionConvertor_10_40 {
public void copyElement(@Nonnull org.hl7.fhir.dstu2.model.Element src,
@Nonnull org.hl7.fhir.r4.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_40.INSTANCE.path(), var);
String... ignoredExtensionUrls) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_40.INSTANCE.path(), ignoredExtensionUrls);
}
public void copyElement(@Nonnull org.hl7.fhir.r4.model.Element src,
@Nonnull org.hl7.fhir.dstu2.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_40.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_40.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r4.model.DomainResource src,
@Nonnull org.hl7.fhir.dstu2.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_40.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_40.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r4.model.BackboneElement src,

14
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/datatypes10_40/BackboneElement10_40.java
View File

@ -4,19 +4,21 @@ import org.hl7.fhir.convertors.context.ConversionContext10_40;
import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement10_40 {
static public void copyBackboneElement(org.hl7.fhir.dstu2.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.dstu2.model.BackboneElement src,
org.hl7.fhir.r4.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext10_40.INSTANCE.getVersionConvertor_10_40().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext10_40.INSTANCE.getVersionConvertor_10_40().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu2.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension10_40.convertExtension(e));
}
}
static public void copyBackboneElement(org.hl7.fhir.r4.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.r4.model.BackboneElement src,
org.hl7.fhir.dstu2.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext10_40.INSTANCE.getVersionConvertor_10_40().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext10_40.INSTANCE.getVersionConvertor_10_40().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r4.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension10_40.convertExtension(e));
}

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/datatypes10_40/Element10_40.java
View File

@ -20,10 +20,10 @@ public class Element10_40 {
public void copyElement(org.hl7.fhir.dstu2.model.Element src,
org.hl7.fhir.r4.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r4.model.Extension convertedExtension = new org.hl7.fhir.r4.model.Extension();

29
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/VersionConvertor_10_50.java
View File

@ -160,31 +160,34 @@ public class VersionConvertor_10_50 {
public void copyElement(@Nonnull org.hl7.fhir.dstu2.model.Element src,
@Nonnull org.hl7.fhir.r5.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r5.model.Element src,
@Nonnull org.hl7.fhir.dstu2.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r5.model.DomainResource src,
public void copyElement(
@Nonnull org.hl7.fhir.r5.model.DomainResource src,
@Nonnull org.hl7.fhir.dstu2.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext10_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
@Nonnull org.hl7.fhir.dstu2.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.dstu2.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.dstu2.model.BackboneElement src,
@Nonnull org.hl7.fhir.r5.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
}

14
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/datatypes10_50/BackboneElement10_50.java
View File

@ -4,19 +4,21 @@ import org.hl7.fhir.convertors.context.ConversionContext10_50;
import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement10_50 {
static public void copyBackboneElement(org.hl7.fhir.dstu2.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.dstu2.model.BackboneElement src,
org.hl7.fhir.r5.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext10_50.INSTANCE.getVersionConvertor_10_50().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext10_50.INSTANCE.getVersionConvertor_10_50().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu2.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension10_50.convertExtension(e));
}
}
static public void copyBackboneElement(org.hl7.fhir.r5.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.r5.model.BackboneElement src,
org.hl7.fhir.dstu2.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext10_50.INSTANCE.getVersionConvertor_10_50().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext10_50.INSTANCE.getVersionConvertor_10_50().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r5.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension10_50.convertExtension(e));
}

12
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/datatypes10_50/Element10_50.java
View File

@ -20,10 +20,10 @@ public class Element10_50 {
public void copyElement(org.hl7.fhir.dstu2.model.Element src,
org.hl7.fhir.r5.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r5.model.Extension convertedExtension = new org.hl7.fhir.r5.model.Extension();
@ -38,10 +38,10 @@ public class Element10_50 {
public void copyElement(org.hl7.fhir.r5.model.Element src,
org.hl7.fhir.dstu2.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.dstu2.model.Extension convertedExtension = new org.hl7.fhir.dstu2.model.Extension();
@ -56,10 +56,10 @@ public class Element10_50 {
public void copyElement(org.hl7.fhir.r5.model.DomainResource src,
org.hl7.fhir.dstu2.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.dstu2.model.Extension convertedExtension = new org.hl7.fhir.dstu2.model.Extension();

28
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_30/VersionConvertor_14_30.java
View File

@ -127,27 +127,31 @@ public class VersionConvertor_14_30 {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.dstu2016may.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.dstu2016may.model.Element src,
@Nonnull org.hl7.fhir.dstu3.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_30.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_30.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.dstu3.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.dstu3.model.Element src,
@Nonnull org.hl7.fhir.dstu2016may.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_30.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_30.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.dstu2016may.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.dstu2016may.model.BackboneElement src,
@Nonnull org.hl7.fhir.dstu3.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.dstu3.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.dstu3.model.BackboneElement src,
@Nonnull org.hl7.fhir.dstu2016may.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
}

14
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_30/datatypes14_30/BackboneElement14_30.java
View File

@ -4,19 +4,21 @@ import org.hl7.fhir.convertors.context.ConversionContext14_30;
import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement14_30 {
static public void copyBackboneElement(org.hl7.fhir.dstu2016may.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.dstu2016may.model.BackboneElement src,
org.hl7.fhir.dstu3.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu2016may.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension14_30.convertExtension(e));
}
}
static public void copyBackboneElement(org.hl7.fhir.dstu3.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.dstu3.model.BackboneElement src,
org.hl7.fhir.dstu2016may.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu3.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension14_30.convertExtension(e));
}

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_30/datatypes14_30/Element14_30.java
View File

@ -21,10 +21,10 @@ public class Element14_30 {
public void copyElement(org.hl7.fhir.dstu2016may.model.Element src,
org.hl7.fhir.dstu3.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore)
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore)
&& (!(e.getUrl().equals(VersionConvertorConstants.PROFILE_EXTENSION)
|| e.getUrl().equals(VersionConvertorConstants.IG_DEPENDSON_PACKAGE_EXTENSION)
|| e.getUrl().equals(VersionConvertorConstants.IG_DEPENDSON_VERSION_EXTENSION))))
@ -42,10 +42,10 @@ public class Element14_30 {
public void copyElement(org.hl7.fhir.dstu3.model.Element src,
org.hl7.fhir.dstu2016may.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.dstu2016may.model.Extension convertedExtension = new org.hl7.fhir.dstu2016may.model.Extension();

28
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_40/VersionConvertor_14_40.java
View File

@ -151,27 +151,31 @@ public class VersionConvertor_14_40 {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.dstu2016may.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.dstu2016may.model.Element src,
@Nonnull org.hl7.fhir.r4.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_40.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_40.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r4.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.r4.model.Element src,
@Nonnull org.hl7.fhir.dstu2016may.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_40.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_40.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r4.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.r4.model.BackboneElement src,
@Nonnull org.hl7.fhir.dstu2016may.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.dstu2016may.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.dstu2016may.model.BackboneElement src,
@Nonnull org.hl7.fhir.r4.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
}

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_40/datatypes14_40/BackboneElement14_40.java
View File

@ -6,8 +6,8 @@ import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement14_40 {
static public void copyBackboneElement(org.hl7.fhir.dstu2016may.model.BackboneElement src,
org.hl7.fhir.r4.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu2016may.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension14_40.convertExtension(e));
}
@ -15,8 +15,8 @@ public class BackboneElement14_40 {
static public void copyBackboneElement(org.hl7.fhir.r4.model.BackboneElement src,
org.hl7.fhir.dstu2016may.model.BackboneElement tgt,
String ... var) throws FHIRException {
ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt, var);
String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r4.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension14_40.convertExtension(e));
}

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_40/datatypes14_40/Element14_40.java
View File

@ -20,10 +20,10 @@ public class Element14_40 {
public void copyElement(org.hl7.fhir.dstu2016may.model.Element src,
org.hl7.fhir.r4.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r4.model.Extension convertedExtension = new org.hl7.fhir.r4.model.Extension();
@ -38,10 +38,10 @@ public class Element14_40 {
public void copyElement(org.hl7.fhir.r4.model.Element src,
org.hl7.fhir.dstu2016may.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.dstu2016may.model.Extension convertedExtension = new org.hl7.fhir.dstu2016may.model.Extension();

28
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/VersionConvertor_14_50.java
View File

@ -143,27 +143,31 @@ public class VersionConvertor_14_50 {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.dstu2016may.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.dstu2016may.model.Element src,
@Nonnull org.hl7.fhir.r5.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r5.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.r5.model.Element src,
@Nonnull org.hl7.fhir.dstu2016may.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext14_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
@Nonnull org.hl7.fhir.dstu2016may.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.dstu2016may.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.dstu2016may.model.BackboneElement src,
@Nonnull org.hl7.fhir.r5.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
}

14
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/datatypes14_50/BackboneElement14_50.java
View File

@ -4,19 +4,21 @@ import org.hl7.fhir.convertors.context.ConversionContext14_50;
import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement14_50 {
static public void copyBackboneElement(org.hl7.fhir.dstu2016may.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.dstu2016may.model.BackboneElement src,
org.hl7.fhir.r5.model.BackboneElement tgt,
String... var) throws FHIRException {
ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu2016may.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension14_50.convertExtension(e));
}
}
static public void copyBackboneElement(org.hl7.fhir.r5.model.BackboneElement src,
static public void copyBackboneElement(
org.hl7.fhir.r5.model.BackboneElement src,
org.hl7.fhir.dstu2016may.model.BackboneElement tgt,
String... var) throws FHIRException {
ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r5.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension14_50.convertExtension(e));
}

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/datatypes14_50/Element14_50.java
View File

@ -21,10 +21,10 @@ public class Element14_50 {
public void copyElement(org.hl7.fhir.dstu2016may.model.Element src,
org.hl7.fhir.r5.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r5.model.Extension convertedExtension = new org.hl7.fhir.r5.model.Extension();
@ -39,10 +39,10 @@ public class Element14_50 {
public void copyElement(org.hl7.fhir.r5.model.Element src,
org.hl7.fhir.dstu2016may.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.dstu2016may.model.Extension convertedExtension = new org.hl7.fhir.dstu2016may.model.Extension();

34
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/VersionConvertor_30_40.java
View File

@ -137,32 +137,38 @@ public class VersionConvertor_30_40 {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyDomainResource(@Nonnull org.hl7.fhir.r4.model.DomainResource src,
@Nonnull org.hl7.fhir.dstu3.model.DomainResource tgt, String... extensionUrlsToIgnore) throws FHIRException {
public void copyDomainResource(
@Nonnull org.hl7.fhir.r4.model.DomainResource src,
@Nonnull org.hl7.fhir.dstu3.model.DomainResource tgt,
String... extensionUrlsToIgnore) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.dstu3.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.dstu3.model.Element src,
@Nonnull org.hl7.fhir.r4.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext30_40.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext30_40.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r4.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.r4.model.Element src,
@Nonnull org.hl7.fhir.dstu3.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext30_40.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext30_40.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r4.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.r4.model.BackboneElement src,
@Nonnull org.hl7.fhir.dstu3.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.dstu3.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.dstu3.model.BackboneElement src,
@Nonnull org.hl7.fhir.r4.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
}

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/datatypes30_40/BackboneElement30_40.java
View File

@ -4,15 +4,15 @@ import org.hl7.fhir.convertors.context.ConversionContext30_40;
import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement30_40 {
static public void copyBackboneElement(org.hl7.fhir.dstu3.model.BackboneElement src, org.hl7.fhir.r4.model.BackboneElement tgt, String... var) throws FHIRException {
ConversionContext30_40.INSTANCE.getVersionConvertor_30_40().copyElement(src, tgt, var);
static public void copyBackboneElement(org.hl7.fhir.dstu3.model.BackboneElement src, org.hl7.fhir.r4.model.BackboneElement tgt, String... extensionUrlsToIgnore) throws FHIRException {
ConversionContext30_40.INSTANCE.getVersionConvertor_30_40().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu3.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension30_40.convertExtension(e));
}
}
static public void copyBackboneElement(org.hl7.fhir.r4.model.BackboneElement src, org.hl7.fhir.dstu3.model.BackboneElement tgt, String... var) throws FHIRException {
ConversionContext30_40.INSTANCE.getVersionConvertor_30_40().copyElement(src, tgt, var);
static public void copyBackboneElement(org.hl7.fhir.r4.model.BackboneElement src, org.hl7.fhir.dstu3.model.BackboneElement tgt, String... extensionUrlsToIgnore) throws FHIRException {
ConversionContext30_40.INSTANCE.getVersionConvertor_30_40().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r4.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension30_40.convertExtension(e));
}

12
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/datatypes30_40/Element30_40.java
View File

@ -13,17 +13,17 @@ public class Element30_40 {
this.advisor = advisor;
}
public boolean isExemptExtension(String url, String[] extensionsToIgnore) {
return Arrays.asList(extensionsToIgnore).contains(url);
public boolean isExemptExtension(String url, String[] extensionUrlsToIgnore) {
return Arrays.asList(extensionUrlsToIgnore).contains(url);
}
public void copyElement(org.hl7.fhir.dstu3.model.Element src,
org.hl7.fhir.r4.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r4.model.Extension convertedExtension = new org.hl7.fhir.r4.model.Extension();
@ -38,10 +38,10 @@ public class Element30_40 {
public void copyElement(org.hl7.fhir.r4.model.Element src,
org.hl7.fhir.dstu3.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.dstu3.model.Extension convertedExtension = new org.hl7.fhir.dstu3.model.Extension();

40
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/VersionConvertor_30_50.java
View File

@ -130,37 +130,45 @@ public class VersionConvertor_30_50 {
}
}
public void copyDomainResource(@Nonnull org.hl7.fhir.dstu3.model.DomainResource src,
@Nonnull org.hl7.fhir.r5.model.DomainResource tgt, String... extensionUrlsToIgnore) throws FHIRException {
public void copyDomainResource(
@Nonnull org.hl7.fhir.dstu3.model.DomainResource src,
@Nonnull org.hl7.fhir.r5.model.DomainResource tgt,
String... extensionUrlsToIgnore) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyDomainResource(@Nonnull org.hl7.fhir.r5.model.DomainResource src,
@Nonnull org.hl7.fhir.dstu3.model.DomainResource tgt, String... extensionUrlsToIgnore) throws FHIRException {
public void copyDomainResource(
@Nonnull org.hl7.fhir.r5.model.DomainResource src,
@Nonnull org.hl7.fhir.dstu3.model.DomainResource tgt,
String... extensionUrlsToIgnore) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.dstu3.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.dstu3.model.Element src,
@Nonnull org.hl7.fhir.r5.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext30_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext30_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r5.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.r5.model.Element src,
@Nonnull org.hl7.fhir.dstu3.model.Element tgt,
String... ignoredExtensionUrls) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext30_50.INSTANCE.path(), ignoredExtensionUrls);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext30_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
@Nonnull org.hl7.fhir.dstu3.model.BackboneElement tgt,
String... ignoredExtensionUrls) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, ignoredExtensionUrls);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.dstu3.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.dstu3.model.BackboneElement src,
@Nonnull org.hl7.fhir.r5.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
}

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/datatypes30_50/BackboneElement30_50.java
View File

@ -4,15 +4,15 @@ import org.hl7.fhir.convertors.context.ConversionContext30_50;
import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement30_50 {
static public void copyBackboneElement(org.hl7.fhir.dstu3.model.BackboneElement src, org.hl7.fhir.r5.model.BackboneElement tgt, String ... var) throws FHIRException {
ConversionContext30_50.INSTANCE.getVersionConvertor_30_50().copyElement(src,tgt, var);
static public void copyBackboneElement(org.hl7.fhir.dstu3.model.BackboneElement src, org.hl7.fhir.r5.model.BackboneElement tgt, String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext30_50.INSTANCE.getVersionConvertor_30_50().copyElement(src,tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.dstu3.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension30_50.convertExtension(e));
}
}
static public void copyBackboneElement(org.hl7.fhir.r5.model.BackboneElement src, org.hl7.fhir.dstu3.model.BackboneElement tgt, String ... var) throws FHIRException {
ConversionContext30_50.INSTANCE.getVersionConvertor_30_50().copyElement(src, tgt, var);
static public void copyBackboneElement(org.hl7.fhir.r5.model.BackboneElement src, org.hl7.fhir.dstu3.model.BackboneElement tgt, String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext30_50.INSTANCE.getVersionConvertor_30_50().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r5.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension30_50.convertExtension(e));
}

12
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/datatypes30_50/Element30_50.java
View File

@ -13,17 +13,17 @@ public class Element30_50 {
this.advisor = advisor;
}
public boolean isExemptExtension(String url, String[] extensionsToIgnore) {
return Arrays.asList(extensionsToIgnore).contains(url);
public boolean isExemptExtension(String url, String[] extensionUrlsToIgnore) {
return Arrays.asList(extensionUrlsToIgnore).contains(url);
}
public void copyElement(org.hl7.fhir.dstu3.model.Element src,
org.hl7.fhir.r5.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r5.model.Extension convertedExtension = new org.hl7.fhir.r5.model.Extension();
@ -38,10 +38,10 @@ public class Element30_50 {
public void copyElement(org.hl7.fhir.r5.model.Element src,
org.hl7.fhir.dstu3.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.dstu3.model.Extension convertedExtension = new org.hl7.fhir.dstu3.model.Extension();

44
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/VersionConvertor_40_50.java
View File

@ -107,37 +107,45 @@ public class VersionConvertor_40_50 {
}
}
public void copyDomainResource(@Nonnull org.hl7.fhir.r4.model.DomainResource src,
@Nonnull org.hl7.fhir.r5.model.DomainResource tgt, String... ignoredExtensionUrls) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, ignoredExtensionUrls);
public void copyDomainResource(
@Nonnull org.hl7.fhir.r4.model.DomainResource src,
@Nonnull org.hl7.fhir.r5.model.DomainResource tgt,
String... extensionUrlsToIgnore) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyDomainResource(@Nonnull org.hl7.fhir.r5.model.DomainResource src,
@Nonnull org.hl7.fhir.r4.model.DomainResource tgt, String... ignoredExtensionUrls) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, ignoredExtensionUrls);
public void copyDomainResource(
@Nonnull org.hl7.fhir.r5.model.DomainResource src,
@Nonnull org.hl7.fhir.r4.model.DomainResource tgt,
String... extensionUrlsToIgnore) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r4.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.r4.model.Element src,
@Nonnull org.hl7.fhir.r5.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext40_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext40_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r5.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.r5.model.Element src,
@Nonnull org.hl7.fhir.r4.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext40_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext40_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
@Nonnull org.hl7.fhir.r4.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r4.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.r4.model.BackboneElement src,
@Nonnull org.hl7.fhir.r5.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
}

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/datatypes40_50/BackboneElement40_50.java
View File

@ -5,15 +5,15 @@ import org.hl7.fhir.convertors.conv40_50.datatypes40_50.special40_50.Extension40
import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement40_50 {
public static void copyBackboneElement(org.hl7.fhir.r4.model.BackboneElement src, org.hl7.fhir.r5.model.BackboneElement tgt, String ... var) throws FHIRException {
ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyElement(src, tgt, var);
public static void copyBackboneElement(org.hl7.fhir.r4.model.BackboneElement src, org.hl7.fhir.r5.model.BackboneElement tgt, String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r4.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension40_50.convertExtension(e));
}
}
public static void copyBackboneElement(org.hl7.fhir.r5.model.BackboneElement src, org.hl7.fhir.r4.model.BackboneElement tgt, String... var) throws FHIRException {
ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyElement(src, tgt, var);
public static void copyBackboneElement(org.hl7.fhir.r5.model.BackboneElement src, org.hl7.fhir.r4.model.BackboneElement tgt, String... extensionUrlsToIgnore) throws FHIRException {
ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r5.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension40_50.convertExtension(e));
}

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/datatypes40_50/Element40_50.java
View File

@ -21,10 +21,10 @@ public class Element40_50 {
public void copyElement(org.hl7.fhir.r4.model.Element src,
org.hl7.fhir.r5.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r5.model.Extension convertedExtension = new org.hl7.fhir.r5.model.Extension();
@ -39,10 +39,10 @@ public class Element40_50 {
public void copyElement(org.hl7.fhir.r5.model.Element src,
org.hl7.fhir.r4.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r4.model.Extension convertedExtension = new org.hl7.fhir.r4.model.Extension();

42
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv43_50/VersionConvertor_43_50.java
View File

@ -107,39 +107,45 @@ public class VersionConvertor_43_50 {
}
}
public void copyDomainResource(@Nonnull org.hl7.fhir.r4b.model.DomainResource src,
public void copyDomainResource(
@Nonnull org.hl7.fhir.r4b.model.DomainResource src,
@Nonnull org.hl7.fhir.r5.model.DomainResource tgt,
String... extensionUrlToIgnore) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlToIgnore);
String... extensionUrlsToIgnore) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyDomainResource(@Nonnull org.hl7.fhir.r5.model.DomainResource src,
public void copyDomainResource(
@Nonnull org.hl7.fhir.r5.model.DomainResource src,
@Nonnull org.hl7.fhir.r4b.model.DomainResource tgt,
String... extensionUrlToIgnore) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlToIgnore);
String... extensionUrlsToIgnore) throws FHIRException {
resourceConvertor.copyDomainResource(src, tgt, extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r4b.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.r4b.model.Element src,
@Nonnull org.hl7.fhir.r5.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext43_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext43_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyElement(@Nonnull org.hl7.fhir.r5.model.Element src,
public void copyElement(
@Nonnull org.hl7.fhir.r5.model.Element src,
@Nonnull org.hl7.fhir.r4b.model.Element tgt,
String... var) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext43_50.INSTANCE.path(), var);
String... extensionUrlsToIgnore) throws FHIRException {
elementConvertor.copyElement(src, tgt, ConversionContext43_50.INSTANCE.path(), extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.r5.model.BackboneElement src,
@Nonnull org.hl7.fhir.r4b.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
public void copyBackboneElement(@Nonnull org.hl7.fhir.r4b.model.BackboneElement src,
public void copyBackboneElement(
@Nonnull org.hl7.fhir.r4b.model.BackboneElement src,
@Nonnull org.hl7.fhir.r5.model.BackboneElement tgt,
String... var) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, var);
String... extensionUrlsToIgnore) throws FHIRException {
backboneElementConvertor.copyBackboneElement(src, tgt, extensionUrlsToIgnore);
}
}

8
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv43_50/datatypes43_50/BackboneElement43_50.java
View File

@ -5,15 +5,15 @@ import org.hl7.fhir.convertors.conv43_50.datatypes43_50.special43_50.Extension43
import org.hl7.fhir.exceptions.FHIRException;
public class BackboneElement43_50 {
public static void copyBackboneElement(org.hl7.fhir.r4b.model.BackboneElement src, org.hl7.fhir.r5.model.BackboneElement tgt, String ... var) throws FHIRException {
ConversionContext43_50.INSTANCE.getVersionConvertor_43_50().copyElement(src, tgt, var);
public static void copyBackboneElement(org.hl7.fhir.r4b.model.BackboneElement src, org.hl7.fhir.r5.model.BackboneElement tgt, String ... extensionUrlsToIgnore) throws FHIRException {
ConversionContext43_50.INSTANCE.getVersionConvertor_43_50().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r4b.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension43_50.convertExtension(e));
}
}
public static void copyBackboneElement(org.hl7.fhir.r5.model.BackboneElement src, org.hl7.fhir.r4b.model.BackboneElement tgt, String... var) throws FHIRException {
ConversionContext43_50.INSTANCE.getVersionConvertor_43_50().copyElement(src, tgt, var);
public static void copyBackboneElement(org.hl7.fhir.r5.model.BackboneElement src, org.hl7.fhir.r4b.model.BackboneElement tgt, String... extensionUrlsToIgnore) throws FHIRException {
ConversionContext43_50.INSTANCE.getVersionConvertor_43_50().copyElement(src, tgt, extensionUrlsToIgnore);
for (org.hl7.fhir.r5.model.Extension e : src.getModifierExtension()) {
tgt.addModifierExtension(Extension43_50.convertExtension(e));
}

12
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv43_50/datatypes43_50/Element43_50.java
View File

@ -14,17 +14,17 @@ public class Element43_50 {
this.advisor = advisor;
}
public static boolean isExemptExtension(String url, String[] extensionsToIgnore) {
return Arrays.asList(extensionsToIgnore).contains(url);
public static boolean isExemptExtension(String url, String[] extensionUrlsToIgnore) {
return Arrays.asList(extensionUrlsToIgnore).contains(url);
}
public void copyElement(org.hl7.fhir.r4b.model.Element src,
org.hl7.fhir.r5.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r5.model.Extension convertedExtension = new org.hl7.fhir.r5.model.Extension();
@ -39,10 +39,10 @@ public class Element43_50 {
public void copyElement(org.hl7.fhir.r5.model.Element src,
org.hl7.fhir.r4b.model.Element tgt,
String path,
String... extensionsToIgnore) throws FHIRException {
String... extensionUrlsToIgnore) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
src.getExtension().stream()
.filter(e -> !isExemptExtension(e.getUrl(), extensionsToIgnore))
.filter(e -> !isExemptExtension(e.getUrl(), extensionUrlsToIgnore))
.forEach(e -> {
if (advisor.useAdvisorForExtension(path, e)) {
org.hl7.fhir.r4b.model.Extension convertedExtension = new org.hl7.fhir.r4b.model.Extension();