honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-09 06:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

more replacing json library

Browse Source
This commit is contained in:
Grahame Grieve 2022-11-25 22:37:43 -03:00
parent 450fa1d02c
commit 363a95bb8a
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/JsonTrackingParserTests.java
View File

@ -12,4 +12,6 @@ public class JsonTrackingParserTests {
JsonTrackingParser.parseJson("{\r\n \"index-version\": 1,\r\n \"files\": []\r\n}");
}
}

3
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java
View File

@ -34,7 +34,6 @@ import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
import org.hl7.fhir.utilities.TextFile;
import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.utilities.VersionUtilities;
import org.hl7.fhir.utilities.json.JsonTrackingParser;
import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
import org.hl7.fhir.utilities.npm.NpmPackage;
import org.hl7.fhir.utilities.turtle.Turtle;
@ -718,7 +717,7 @@ public class IgLoader {
private Manager.FhirFormat checkFormat(byte[] cnt, String filename) {
System.out.println(" ..Detect format for " + filename);
try {
JsonTrackingParser.parseJson(cnt);
org.hl7.fhir.utilities.json.parser.JsonParser.parseObject(cnt);
return Manager.FhirFormat.JSON;
} catch (Exception e) {
log("Not JSON: " + e.getMessage());

7
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ResourceChecker.java
View File

@ -11,9 +11,8 @@ import org.hl7.fhir.r5.elementmodel.SHCParser.JWT;
import org.hl7.fhir.r5.utils.structuremap.StructureMapUtilities;
import org.hl7.fhir.utilities.TextFile;
import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.utilities.json.JsonTrackingParser;
import com.google.gson.JsonObject;
import org.hl7.fhir.utilities.json.model.JsonObject;
import org.hl7.fhir.utilities.json.parser.JsonParser;
public class ResourceChecker {
@ -56,7 +55,7 @@ public class ResourceChecker {
}
// no, we have to look inside, and decide.
try {
JsonObject json = JsonTrackingParser.parseJson(cnt);
JsonObject json = JsonParser.parseObject(cnt);
if (json.has("verifiableCredential")) {
return FhirFormat.SHC;
}

11
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java
View File

@ -30,12 +30,11 @@ import org.hl7.fhir.r5.utils.validation.constants.ReferenceValidationPolicy;
import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.utilities.VersionUtilities;
import org.hl7.fhir.utilities.VersionUtilities.VersionURLInfo;
import org.hl7.fhir.utilities.json.JsonTrackingParser;
import org.hl7.fhir.utilities.json.JsonUtilities;
import org.hl7.fhir.utilities.json.model.JsonObject;
import org.hl7.fhir.utilities.json.parser.JsonParser;
import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
import org.hl7.fhir.utilities.npm.NpmPackage;
import com.google.gson.JsonObject;
public class StandAloneValidatorFetcher implements IValidatorResourceFetcher, IValidationPolicyAdvisor, IWorkerContextManager.ICanonicalResourceLocator {
@ -166,9 +165,9 @@ public class StandAloneValidatorFetcher implements IValidatorResourceFetcher, IV
if (mappingsUris.isEmpty()) {
JsonObject json;
try {
json = JsonTrackingParser.fetchJson("http://hl7.org/fhir/mappingspaces.json");
for (JsonObject ms : JsonUtilities.objects(json, "spaces")) {
mappingsUris.add(JsonUtilities.str(ms, "url"));
json = JsonParser.parseObjectFromUrl("http://hl7.org/fhir/mappingspaces.json");
for (JsonObject ms : json.getJsonObjects("spaces")) {
mappingsUris.add(ms.asString("url"));
}
} catch (IOException e) {
// frozen R4 list