Fix terminology cache hashing (hapifhir#2006)

* Fix tx-cache by normalizing end-of-line

* Simple tests to make sure we don't regress

Author: dotasek

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/TerminologyCache.java

@@ -959,7 +959,10 @@ private String loadJS(JsonElement e) {
   }
 
   public String hashJson(String s) {
-    return String.valueOf(s.trim().hashCode());
+    return String.valueOf(s
+      .trim()
+      .replaceAll("\\r\\n?", "\n")
+      .hashCode());
   }
 
   // management

org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/TerminologyCacheTests.java

@@ -26,7 +26,6 @@
 import org.hl7.fhir.r5.terminologies.expansion.ValueSetExpansionOutcome;
 import org.hl7.fhir.r5.terminologies.utilities.TerminologyCache;
 import org.hl7.fhir.r5.terminologies.utilities.ValidationResult;
-import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.filesystem.ManagedFileAccess;
 import org.hl7.fhir.utilities.tests.ResourceLoaderTests;
 import org.hl7.fhir.utilities.validation.ValidationMessage;
@@ -550,4 +549,38 @@ public void testCacheTokenGeneration(String system, String expectedName) throws
       assertEquals(expectedName + "_dummyVersion", cacheToken.getName());
     }
   }
+
+  @Test
+  void testHashJsonHandlesDifferentEndOfLine() throws IOException {
+    TerminologyCache terminologyCache = createTerminologyCache();
+    String newLineJson = "{\n" +
+        "  \"resourceType\": \"ValueSet\",\n" +
+        "  \"id\": \"dummyId\"\n" +
+        "}";
+    String newLineAndCarriageReturnJson = "{\r\n" +
+        "  \"resourceType\": \"ValueSet\",\r\n" +
+        "  \"id\": \"dummyId\"\r\n" +
+        "}";
+    String newLineToken = terminologyCache.hashJson(newLineJson);
+    String newLineAndCarriageReturnToken = terminologyCache.hashJson(newLineAndCarriageReturnJson);
+
+    assertEquals(newLineToken, newLineAndCarriageReturnToken);
+  }
+
+  @Test
+  void testHashJsonHandlesLeadingAndTrailingWhitespace() throws IOException {
+    TerminologyCache terminologyCache = createTerminologyCache();
+    String paddedJson = "   {\n" +
+      "  \"resourceType\": \"ValueSet\",\n" +
+      "  \"id\": \"dummyId\"\n" +
+      "}\n   ";
+    String json = "{\n" +
+      "  \"resourceType\": \"ValueSet\",\n" +
+      "  \"id\": \"dummyId\"\n" +
+      "}";
+    String paddedJsonToken = terminologyCache.hashJson(paddedJson);
+    String jsonToken = terminologyCache.hashJson(json);
+
+    assertEquals(paddedJsonToken, jsonToken);
+  }
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/fhir-types.cache

@@ -1,28 +1,4 @@
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/fhir-types",
-  "code" : "OperationOutcome"
-}, "valueSet" :null, "langs":"en-CA", "useServer":"true", "useClient":"true", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  },
-  {
-    "name" : "displayLanguage",
-    "valueCode" : "en-US"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "A definition for CodeSystem 'http://hl7.org/fhir/fhir-types' could not be found, so the code cannot be validated",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://hl7.org/fhir/fhir-types",
   "code" : "OperationOutcome"