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

NPE proofing property handling for Code Systems

This commit is contained in:
Grahame Grieve 2023-09-04 13:38:37 +10:00
parent 5cc4e3ef03
commit 808acb9d29
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/CodeSystemUtilities.java
View File

@ -105,7 +105,7 @@ public class CodeSystemUtilities {
@Override @Override
public int compare(ConceptDefinitionComponent o1, ConceptDefinitionComponent o2) { public int compare(ConceptDefinitionComponent o1, ConceptDefinitionComponent o2) {
return o1.getCode().compareToIgnoreCase(o2.getCode()); return o1.hasCode() ? o1.getCode().compareToIgnoreCase(o2.getCode()) : 0;
} }
} }
@ -252,7 +252,7 @@ public class CodeSystemUtilities {
private static String defineProperty(CodeSystem cs, String code, PropertyType pt) { private static String defineProperty(CodeSystem cs, String code, PropertyType pt) {
String url = "http://hl7.org/fhir/concept-properties#"+code; String url = "http://hl7.org/fhir/concept-properties#"+code;
for (PropertyComponent p : cs.getProperty()) { for (PropertyComponent p : cs.getProperty()) {
if (p.getCode().equals(code)) { if (p.hasCode() && p.getCode().equals(code)) {
if (!p.getUri().equals(url)) { if (!p.getUri().equals(url)) {
throw new Error("URI mismatch for code "+code+" url = "+p.getUri()+" vs "+url); throw new Error("URI mismatch for code "+code+" url = "+p.getUri()+" vs "+url);
} }
@ -391,7 +391,7 @@ public class CodeSystemUtilities {
public static void defineCodeSystemProperty(CodeSystem cs, String code, String description, PropertyType type) { public static void defineCodeSystemProperty(CodeSystem cs, String code, String description, PropertyType type) {
for (PropertyComponent p : cs.getProperty()) { for (PropertyComponent p : cs.getProperty()) {
if (p.getCode().equals(code)) if (p.hasCode() && p.getCode().equals(code))
return; return;
} }
cs.addProperty().setCode(code).setDescription(description).setType(type).setUri("http://hl7.org/fhir/concept-properties#"+code); cs.addProperty().setCode(code).setDescription(description).setType(type).setUri("http://hl7.org/fhir/concept-properties#"+code);
@ -466,7 +466,7 @@ public class CodeSystemUtilities {
public static ConceptDefinitionComponent findCode(List<ConceptDefinitionComponent> list, String code) { public static ConceptDefinitionComponent findCode(List<ConceptDefinitionComponent> list, String code) {
for (ConceptDefinitionComponent c : list) { for (ConceptDefinitionComponent c : list) {
if (c.getCode().equals(code)) if (c.hasCode() && c.getCode().equals(code))
return c; return c;
ConceptDefinitionComponent s = findCode(c.getConcept(), code); ConceptDefinitionComponent s = findCode(c.getConcept(), code);
if (s != null) if (s != null)
@ -477,7 +477,7 @@ public class CodeSystemUtilities {
public static ConceptDefinitionComponent findCodeOrAltCode(List<ConceptDefinitionComponent> list, String code, String use) { public static ConceptDefinitionComponent findCodeOrAltCode(List<ConceptDefinitionComponent> list, String code, String use) {
for (ConceptDefinitionComponent c : list) { for (ConceptDefinitionComponent c : list) {
if (c.getCode().equals(code)) if (c.hasCode() && c.getCode().equals(code))
return c; return c;
for (ConceptPropertyComponent p : c.getProperty()) { for (ConceptPropertyComponent p : c.getProperty()) {
if ("alternateCode".equals(p.getCode()) && (use == null || hasUse(p, use)) && p.hasValue() && p.getValue().isPrimitive() && code.equals(p.getValue().primitiveValue())) { if ("alternateCode".equals(p.getCode()) && (use == null || hasUse(p, use)) && p.hasValue() && p.getValue().isPrimitive() && code.equals(p.getValue().primitiveValue())) {
@ -537,29 +537,30 @@ public class CodeSystemUtilities {
public static DataType readProperty(ConceptDefinitionComponent concept, String code) { public static DataType readProperty(ConceptDefinitionComponent concept, String code) {
for (ConceptPropertyComponent p : concept.getProperty()) for (ConceptPropertyComponent p : concept.getProperty())
if (p.getCode().equals(code)) if (p.hasCode() && p.getCode().equals(code))
return p.getValue(); return p.getValue();
return null; return null;
} }
public static ConceptPropertyComponent getProperty(ConceptDefinitionComponent concept, String code) { public static ConceptPropertyComponent getProperty(ConceptDefinitionComponent concept, String code) {
for (ConceptPropertyComponent p : concept.getProperty()) for (ConceptPropertyComponent p : concept.getProperty())
if (p.getCode().equals(code)) if (p.hasCode() && p.getCode().equals(code))
return p; return p;
return null; return null;
} }
public static List<ConceptPropertyComponent> getPropertyValues(ConceptDefinitionComponent concept, String code) { public static List<ConceptPropertyComponent> getPropertyValues(ConceptDefinitionComponent concept, String code) {
List<ConceptPropertyComponent> res = new ArrayList<>(); List<ConceptPropertyComponent> res = new ArrayList<>();
for (ConceptPropertyComponent p : concept.getProperty()) { if (code != null) {
if (p.getCode().equals(code)) { for (ConceptPropertyComponent p : concept.getProperty()) {
res.add(p); if (code.equals(p.getCode())) {
res.add(p);
}
} }
} }
return res; return res;
} }
// see http://hl7.org/fhir/R4/codesystem.html#hierachy // see http://hl7.org/fhir/R4/codesystem.html#hierachy
// returns additional parents not in the heirarchy // returns additional parents not in the heirarchy
public static List<String> getOtherChildren(CodeSystem cs, ConceptDefinitionComponent c) { public static List<String> getOtherChildren(CodeSystem cs, ConceptDefinitionComponent c) {
@ -828,7 +829,7 @@ public class CodeSystemUtilities {
private static String defineProperty(CodeSystem cs, PropertyComponent pd, PropertyType pt) { private static String defineProperty(CodeSystem cs, PropertyComponent pd, PropertyType pt) {
for (PropertyComponent p : cs.getProperty()) { for (PropertyComponent p : cs.getProperty()) {
if (p.getCode().equals(pd.getCode())) { if (p.hasCode() && p.getCode().equals(pd.getCode())) {
if (!p.getUri().equals(pd.getUri())) { if (!p.getUri().equals(pd.getUri())) {
throw new Error("URI mismatch for code "+pd.getCode()+" url = "+p.getUri()+" vs "+pd.getUri()); throw new Error("URI mismatch for code "+pd.getCode()+" url = "+p.getUri()+" vs "+pd.getUri());
} }
@ -846,7 +847,7 @@ public class CodeSystemUtilities {
private static PropertyComponent getPropertyDefinition(CodeSystem cs, ConceptPropertyComponent p) { private static PropertyComponent getPropertyDefinition(CodeSystem cs, ConceptPropertyComponent p) {
for (PropertyComponent t : cs.getProperty()) { for (PropertyComponent t : cs.getProperty()) {
if (t.getCode().equals(p.getCode())) { if (t.hasCode() && t.getCode().equals(p.getCode())) {
return t; return t;
} }
} }
@ -881,7 +882,7 @@ public class CodeSystemUtilities {
public static boolean hasPropertyDef(CodeSystem cs, String property) { public static boolean hasPropertyDef(CodeSystem cs, String property) {
for (PropertyComponent pd : cs.getProperty()) { for (PropertyComponent pd : cs.getProperty()) {
if (pd.getCode().equals(property)) { if (pd.hasCode() && pd.getCode().equals(property)) {
return true; return true;
} }
} }