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

Merge branch 'release' into merge_branch

This commit is contained in:
Mark Iantorno 2020-06-12 19:34:50 -04:00 committed by GitHub
parent b51172b898 0fb57007c4
commit f5455bb9e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 451 additions and 456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES.md
View File

@ -5,3 +5,4 @@
* Fix bug rendering DiagnosticReports with multiple categories * Fix bug rendering DiagnosticReports with multiple categories
* adjust check on Attachment to only be an warning (when no meaningful content exists) * adjust check on Attachment to only be an warning (when no meaningful content exists)
* add security check mode to Validator * add security check mode to Validator

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonRenderer.java
View File

@ -15,6 +15,7 @@ import org.hl7.fhir.r5.comparison.CodeSystemComparer.CodeSystemComparison;
import org.hl7.fhir.r5.comparison.ProfileComparer.ProfileComparison; import org.hl7.fhir.r5.comparison.ProfileComparer.ProfileComparison;
import org.hl7.fhir.r5.comparison.ResourceComparer.ResourceComparison; import org.hl7.fhir.r5.comparison.ResourceComparer.ResourceComparison;
import org.hl7.fhir.r5.comparison.ValueSetComparer.ValueSetComparison; import org.hl7.fhir.r5.comparison.ValueSetComparer.ValueSetComparison;
import org.hl7.fhir.r5.conformance.ProfileUtilities; import org.hl7.fhir.r5.conformance.ProfileUtilities;
import org.hl7.fhir.r5.context.IWorkerContext; import org.hl7.fhir.r5.context.IWorkerContext;
import org.hl7.fhir.r5.formats.IParser.OutputStyle; import org.hl7.fhir.r5.formats.IParser.OutputStyle;
@ -22,6 +23,7 @@ import org.hl7.fhir.r5.model.Base;
import org.hl7.fhir.r5.model.ExpressionNode.CollectionStatus; import org.hl7.fhir.r5.model.ExpressionNode.CollectionStatus;
import org.hl7.fhir.r5.model.StringType; import org.hl7.fhir.r5.model.StringType;
import org.hl7.fhir.r5.model.Tuple; import org.hl7.fhir.r5.model.Tuple;
import org.hl7.fhir.r5.model.TypeDetails; import org.hl7.fhir.r5.model.TypeDetails;
import org.hl7.fhir.r5.model.ValueSet; import org.hl7.fhir.r5.model.ValueSet;
import org.hl7.fhir.r5.utils.FHIRPathEngine.IEvaluationContext; import org.hl7.fhir.r5.utils.FHIRPathEngine.IEvaluationContext;
@ -78,7 +80,6 @@ public class ComparisonRenderer implements IEvaluationContext {
for (String k : context.getBinaries().keySet()) { for (String k : context.getBinaries().keySet()) {
TextFile.bytesToFile(context.getBinaries().get(k), Utilities.path(folder, k)); TextFile.bytesToFile(context.getBinaries().get(k), Utilities.path(folder, k));
} }
} }
private void renderComparison(String id, ResourceComparison comp) throws IOException { private void renderComparison(String id, ResourceComparison comp) throws IOException {

8
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonSession.java
View File

@ -42,8 +42,6 @@ public class ComparisonSession {
return context; return context;
} }
public String getTitle() { public String getTitle() {
return title; return title;
} }
@ -92,7 +90,6 @@ public class ComparisonSession {
return urlL+"|"+verL+"||"+urlR+"|"+verR; return urlL+"|"+verL+"||"+urlR+"|"+verR;
} }
public void identify(CanonicalResource res) { public void identify(CanonicalResource res) {
count++; count++;
res.setId(sessiondId+"-"+count); res.setId(sessiondId+"-"+count);
@ -114,9 +111,4 @@ public class ComparisonSession {
public Map<String, ResourceComparison> getCompares() { public Map<String, ResourceComparison> getCompares() {
return compares; return compares;
} }
} }

3
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/r5/test/FHIRMappingLanguageTests.java
View File

@ -6,6 +6,7 @@ import java.io.ByteArrayOutputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -23,6 +24,7 @@ import org.hl7.fhir.utilities.TextFile;
import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.utilities.xml.XMLUtil; import org.hl7.fhir.utilities.xml.XMLUtil;
import org.hl7.fhir.validation.ValidationEngine; import org.hl7.fhir.validation.ValidationEngine;
import org.hl7.fhir.validation.instance.InstanceValidatorFactory; import org.hl7.fhir.validation.instance.InstanceValidatorFactory;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
@ -113,5 +115,4 @@ public class FHIRMappingLanguageTests {
} }
assertTrue(msg, Utilities.noString(msg)); assertTrue(msg, Utilities.noString(msg));
} }
} }