From a12324c3a6137ac23a1f52ac10e82989af6b39e8 Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 6 Jan 2022 16:56:19 -0500 Subject: [PATCH] Remove unnecessary synchronized block + System.out --- .../hl7/fhir/r5/context/TerminologyCache.java | 97 +++++++++---------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java index 061807af8..5b589e05e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java @@ -127,7 +127,6 @@ public class TerminologyCache { static { String cacheErrorsProperty = System.getProperty("cacheErrors"); cacheErrors = cacheErrorsProperty != null ? "TRUE".equals(cacheErrorsProperty.toUpperCase(Locale.ROOT)) : false; - System.out.println(); } // use lock from the context @@ -422,58 +421,56 @@ public class TerminologyCache { } private void load() throws FHIRException { - synchronized (lock) { - for (String fn : new File(folder).list()) { - if (fn.endsWith(".cache") && !fn.equals("validation.cache")) { - int c = 0; - try { - String title = fn.substring(0, fn.lastIndexOf(".")); - NamedCache nc = new NamedCache(); - nc.name = title; - caches.put(title, nc); - String src = TextFile.fileToString(Utilities.path(folder, fn)); - if (src.startsWith("?")) - src = src.substring(1); - int i = src.indexOf(ENTRY_MARKER); - while (i > -1) { - c++; - String s = src.substring(0, i); - src = src.substring(i + ENTRY_MARKER.length() + 1); - i = src.indexOf(ENTRY_MARKER); - if (!Utilities.noString(s)) { - int j = s.indexOf(BREAK); - String q = s.substring(0, j); - String p = s.substring(j + BREAK.length() + 1).trim(); - CacheEntry ce = new CacheEntry(); - ce.persistent = true; - ce.request = q; - boolean e = p.charAt(0) == 'e'; - p = p.substring(3); - JsonObject o = (JsonObject) new com.google.gson.JsonParser().parse(p); - String error = loadJS(o.get("error")); - if (e) { - if (o.has("valueSet")) - ce.e = new ValueSetExpansionOutcome((ValueSet) new JsonParser().parse(o.getAsJsonObject("valueSet")), error, TerminologyServiceErrorClass.UNKNOWN); - else - ce.e = new ValueSetExpansionOutcome(error, TerminologyServiceErrorClass.UNKNOWN); - } else { - String t = loadJS(o.get("severity")); - IssueSeverity severity = t == null ? null : IssueSeverity.fromCode(t); - String display = loadJS(o.get("display")); - String code = loadJS(o.get("code")); - String system = loadJS(o.get("system")); - String definition = loadJS(o.get("definition")); - t = loadJS(o.get("class")); - TerminologyServiceErrorClass errorClass = t == null ? null : TerminologyServiceErrorClass.valueOf(t); - ce.v = new ValidationResult(severity, error, system, new ConceptDefinitionComponent().setDisplay(display).setDefinition(definition).setCode(code)).setErrorClass(errorClass); - } - nc.map.put(String.valueOf(hashNWS(ce.request)), ce); - nc.list.add(ce); + for (String fn : new File(folder).list()) { + if (fn.endsWith(".cache") && !fn.equals("validation.cache")) { + int c = 0; + try { + String title = fn.substring(0, fn.lastIndexOf(".")); + NamedCache nc = new NamedCache(); + nc.name = title; + caches.put(title, nc); + String src = TextFile.fileToString(Utilities.path(folder, fn)); + if (src.startsWith("?")) + src = src.substring(1); + int i = src.indexOf(ENTRY_MARKER); + while (i > -1) { + c++; + String s = src.substring(0, i); + src = src.substring(i + ENTRY_MARKER.length() + 1); + i = src.indexOf(ENTRY_MARKER); + if (!Utilities.noString(s)) { + int j = s.indexOf(BREAK); + String q = s.substring(0, j); + String p = s.substring(j + BREAK.length() + 1).trim(); + CacheEntry ce = new CacheEntry(); + ce.persistent = true; + ce.request = q; + boolean e = p.charAt(0) == 'e'; + p = p.substring(3); + JsonObject o = (JsonObject) new com.google.gson.JsonParser().parse(p); + String error = loadJS(o.get("error")); + if (e) { + if (o.has("valueSet")) + ce.e = new ValueSetExpansionOutcome((ValueSet) new JsonParser().parse(o.getAsJsonObject("valueSet")), error, TerminologyServiceErrorClass.UNKNOWN); + else + ce.e = new ValueSetExpansionOutcome(error, TerminologyServiceErrorClass.UNKNOWN); + } else { + String t = loadJS(o.get("severity")); + IssueSeverity severity = t == null ? null : IssueSeverity.fromCode(t); + String display = loadJS(o.get("display")); + String code = loadJS(o.get("code")); + String system = loadJS(o.get("system")); + String definition = loadJS(o.get("definition")); + t = loadJS(o.get("class")); + TerminologyServiceErrorClass errorClass = t == null ? null : TerminologyServiceErrorClass.valueOf(t); + ce.v = new ValidationResult(severity, error, system, new ConceptDefinitionComponent().setDisplay(display).setDefinition(definition).setCode(code)).setErrorClass(errorClass); } + nc.map.put(String.valueOf(hashNWS(ce.request)), ce); + nc.list.add(ce); } - } catch (Exception e) { - throw new FHIRException("Error loading " + fn + ": " + e.getMessage() + " entry " + c, e); } + } catch (Exception e) { + throw new FHIRException("Error loading " + fn + ": " + e.getMessage() + " entry " + c, e); } } }