From 3de429ae6ae243d507b11eecefa03b176e9119e8 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Wed, 13 Nov 2019 07:49:12 +1100
Subject: [PATCH] Release new version

---
 .../java/org/hl7/fhir/dstu3/importers/Mimic14Importer.java    | 3 ++-
 .../main/java/org/hl7/fhir/r4/importers/Mimic14Importer.java  | 3 ++-
 .../main/java/org/hl7/fhir/r5/utils/NPMPackageGenerator.java  | 2 +-
 .../main/java/org/hl7/fhir/utilities/cache/NpmPackage.java    | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/importers/Mimic14Importer.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/importers/Mimic14Importer.java
index 27cd9e2ab..69ad98622 100644
--- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/importers/Mimic14Importer.java
+++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/importers/Mimic14Importer.java
@@ -80,6 +80,7 @@ import org.hl7.fhir.dstu3.model.Reference;
 import org.hl7.fhir.dstu3.model.Type;
 import org.hl7.fhir.utilities.CSVReader;
 import org.hl7.fhir.utilities.IniFile;
+import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 
 public class Mimic14Importer {
@@ -561,7 +562,7 @@ public class Mimic14Importer {
       } else {
         throw new FHIRException("Unhandled Note type '"+cat+"'/'"+desc+"'");
       }
-      dr.addContent().getAttachment().setContentType("text/plain; charset=UTF-8").setData(csv.cell("text").getBytes(Charset.forName("UTF-8")));
+      dr.addContent().getAttachment().setContentType("text/plain; charset=UTF-8").setData(TextFile.stringToBytes(csv.cell("text"), false));
       bnd.addEntry().setResource(dr);
     }
     System.out.println(Integer.toString(t)+" found");
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/importers/Mimic14Importer.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/importers/Mimic14Importer.java
index 09b4dd9ea..1b0d43e0e 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/importers/Mimic14Importer.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/importers/Mimic14Importer.java
@@ -76,6 +76,7 @@ import org.hl7.fhir.r4.model.Reference;
 import org.hl7.fhir.r4.model.Type;
 import org.hl7.fhir.utilities.CSVReader;
 import org.hl7.fhir.utilities.IniFile;
+import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 
 public class Mimic14Importer {
@@ -561,7 +562,7 @@ public class Mimic14Importer {
       } else {
         throw new FHIRException("Unhandled Note type '"+cat+"'/'"+desc+"'");
       }
-      dr.addContent().getAttachment().setContentType("text/plain; charset=UTF-8").setData(csv.cell("text").getBytes(Charset.forName("UTF-8")));
+      dr.addContent().getAttachment().setContentType("text/plain; charset=UTF-8").setData(TextFile.stringToBytes(csv.cell("text"), false));
       bnd.addEntry().setResource(dr);
     }
     System.out.println(Integer.toString(t)+" found");
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NPMPackageGenerator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NPMPackageGenerator.java
index 0f853e6a6..0324000aa 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NPMPackageGenerator.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NPMPackageGenerator.java
@@ -324,7 +324,7 @@ public class NPMPackageGenerator {
   }
 
   private void buildIndexJson() throws IOException {
-    byte[] content = indexer.build().getBytes(Charset.forName("UTF-8"));
+    byte[] content = TextFile.stringToBytes(indexer.build(), false);
     addFile(Category.RESOURCE, ".index.json", content); 
   }
 
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java
index c0ae6c885..3c38f4e31 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java
@@ -182,7 +182,7 @@ public class NpmPackage {
           indexer.seeFile(n.substring(8), res.content.get(n));
         }          
       }
-      res.content.put("package/.index.json", indexer.build().getBytes(Charsets.UTF_8));
+      res.content.put("package/.index.json", TextFile.stringToBytes(indexer.build(), false));
     }
     try {
       res.npm = JsonTrackingParser.parseJson(res.content.get("package/package.json"));
@@ -526,7 +526,7 @@ public class NpmPackage {
         tar.closeArchiveEntry();
       }
     }
-    byte[] cnt = new GsonBuilder().setPrettyPrinting().create().toJson(npm).getBytes(Charset.forName("UTF-8"));
+    byte[] cnt = TextFile.stringToBytes(new GsonBuilder().setPrettyPrinting().create().toJson(npm), false);
     TarArchiveEntry entry = new TarArchiveEntry("package/package.json");
     entry.setSize(cnt.length);
     tar.putArchiveEntry(entry);