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

minor fixes from testing

This commit is contained in:
Grahame Grieve 2023-09-19 10:37:10 +10:00
parent d3ba55018b
commit 19e651b7bf
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,8 +206,14 @@ public class ComparisonSession {
public void markDeleted(Base parent, String name, Base other) {
if (isAnnotate() && other != null) {
getAnnotation(parent).deleted(name, other);
getAnnotation(other).deleted();
VersionComparisonAnnotation annotation = getAnnotation(parent);
if (annotation != null) {
annotation.deleted(name, other);
}
annotation = getAnnotation(other);
if (annotation != null) {
annotation.deleted(name, other);
}
}
}

18
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TypeManager.java
View File

@ -18,8 +18,8 @@ public class TypeManager {
private CanonicalResourceManager<StructureDefinition> structures;
private Map<String, List<StructureDefinition>> typeDefinitions = new HashMap<>();
private Map<String, List<StructureDefinition>> fhirTypeDefinitions = new HashMap<>();
private Map<String, Set<StructureDefinition>> typeDefinitions = new HashMap<>();
private Map<String, Set<StructureDefinition>> fhirTypeDefinitions = new HashMap<>();
private Set<String> primitiveNames = new HashSet<>();
private Set<String> dataTypeNames = new HashSet<>();
@ -47,16 +47,16 @@ public class TypeManager {
public void see(StructureDefinition sd) {
if (sd.getDerivation() != TypeDerivationRule.CONSTRAINT) {
String type = sd.getType();
List<StructureDefinition> types = typeDefinitions.get(type);
Set<StructureDefinition> types = typeDefinitions.get(type);
if (types == null) {
types = new ArrayList<>();
types = new HashSet<>();
typeDefinitions.put(type, types);
}
types.add(sd);
if (sd.getUrl().startsWith("http://hl7.org/fhir/StructureDefinition/")) {
types = fhirTypeDefinitions.get(type);
if (types == null) {
types = new ArrayList<>();
types = new HashSet<>();
fhirTypeDefinitions.put(type, types);
}
types.add(sd);
@ -72,7 +72,7 @@ public class TypeManager {
public List<StructureDefinition> getDefinitions(String typeName) {
List<StructureDefinition> list = new ArrayList<>();
List<StructureDefinition> defined = typeDefinitions.get(typeName);
Set<StructureDefinition> defined = typeDefinitions.get(typeName);
if (defined != null) {
list.addAll(defined);
}
@ -80,11 +80,11 @@ public class TypeManager {
}
public StructureDefinition fetchTypeDefinition(String typeName) {
List<StructureDefinition> types = typeDefinitions.get(typeName);
Set<StructureDefinition> types = typeDefinitions.get(typeName);
if (types == null) {
return null; // throw new FHIRException("Unresolved type "+typeName+" (0)");
} else if (types.size() == 1) {
return types.get(0);
return types.iterator().next();
} else {
types = fhirTypeDefinitions.get(typeName);
if (types == null) {
@ -92,7 +92,7 @@ public class TypeManager {
} else if (types.size() != 1) {
throw new FHIRException("Ambiguous type "+typeName+" ("+types.toString()+") (contact Grahame Grieve for investigation)");
} else {
return types.get(0);
return types.iterator().next();
}
}
}

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/JsonParser.java
View File

@ -144,7 +144,7 @@ public class JsonParser extends ParserBase {
List<ValidatedFragment> res = new ArrayList<>();
res.add(ctxt);
// long t=System.currentTimeMillis()-start;
// long t =System.currentTimeMillis()-start;
// System.out.println("json parser: "+(t)+"ms, "+(content.length/1024)+"kb "+(t == 0 ? "" : " @ "+(content.length / t)+"kb/s"));
return res;
}