From 363a95bb8a3cbab0836e76f894785b3b54c18cb4 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.ccom>
Date: Fri, 25 Nov 2022 22:37:43 -0300
Subject: [PATCH] more replacing json library

---
 .../fhir/utilities/tests/JsonTrackingParserTests.java |  2 ++
 .../main/java/org/hl7/fhir/validation/IgLoader.java   |  3 +--
 .../java/org/hl7/fhir/validation/ResourceChecker.java |  7 +++----
 .../cli/services/StandAloneValidatorFetcher.java      | 11 +++++------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/JsonTrackingParserTests.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/JsonTrackingParserTests.java
index 8122218fc..203a96f04 100644
--- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/JsonTrackingParserTests.java
+++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/JsonTrackingParserTests.java
@@ -12,4 +12,6 @@ public class JsonTrackingParserTests {
     JsonTrackingParser.parseJson("{\r\n  \"index-version\": 1,\r\n  \"files\": []\r\n}");
   }
   
+
+  
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java
index 6d76395aa..cb19550ee 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java
@@ -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());
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ResourceChecker.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ResourceChecker.java
index e38bf8aa2..5b6594d8d 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ResourceChecker.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ResourceChecker.java
@@ -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;
           }        
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java
index 4daad9479..ce364c1f1 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/StandAloneValidatorFetcher.java
@@ -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