From c58516ce448ef6168321fdeceb8a8fc34bb19c22 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Wed, 20 Apr 2022 09:59:30 +1000 Subject: [PATCH] remove references to c:\temp --- .../convertors/SpecDifferenceEvaluator.java | 2 +- .../hl7/fhir/convertors/misc/CKMImporter.java | 4 ++-- .../fhir/convertors/misc/ICPC2Importer.java | 7 ++++--- .../convertors/misc/IGPackConverter102.java | 8 ++++---- .../convertors/misc/IGPackConverter140.java | 7 ++++--- .../fhir/convertors/misc/NUCCConvertor.java | 4 ++-- .../misc/ObservationStatsBuilder.java | 5 +++-- .../convertors/misc/PhinVadsImporter.java | 2 +- .../misc/iso21090/ISO21090Importer.java | 4 ++-- .../searchparam/SearchParameterProcessor.java | 8 ++++---- .../terminologies/LoincToDEConvertor.java | 2 +- .../dstu2/test/NarrativeGeneratorTests.java | 3 ++- .../dstu2/test/ProfileUtilitiesTests.java | 8 ++++---- .../test/QuestionnaireBuilderTester.java | 2 +- .../hl7/fhir/dstu2/test/TestingUtilities.java | 4 ++-- .../fhir/dstu2016may/metamodel/Tester.java | 2 +- .../terminologies/ICPC2Importer.java | 7 ++++--- .../terminologies/LoincToDEConvertor.java | 1 - .../test/NarrativeGeneratorTests.java | 3 ++- .../fhir/dstu2016may/test/ParserTests.java | 5 +++-- .../test/QuestionnaireBuilderTester.java | 2 +- .../fhir/dstu2016may/test/RoundTripTest.java | 4 ++-- .../dstu2016may/test/StructureMapTests.java | 2 +- .../dstu2016may/test/TestingUtilities.java | 4 ++-- .../hl7/fhir/dstu3/elementmodel/Tester.java | 2 +- .../terminologies/LoincToDEConvertor.java | 1 - .../dstu3/test/NarrativeGeneratorTests.java | 3 ++- .../dstu3/test/ProfileUtilitiesTests.java | 8 ++++---- .../test/QuestionnaireBuilderTester.java | 2 +- .../dstu3/test/SnapShotGenerationTests.java | 2 +- .../fhir/dstu3/test/StructureMapTests.java | 4 ++-- .../dstu3/test/support/TestingUtilities.java | 4 ++-- .../fhir/r4/elementmodel/ObjectConverter.java | 2 +- .../org/hl7/fhir/r4/elementmodel/Tester.java | 2 +- .../r4/terminologies/LoincToDEConvertor.java | 1 - .../fhir/r4/test/utils/TestingUtilities.java | 9 ++------- .../hl7/fhir/r4/utils/DigitalSignatures.java | 3 ++- .../hl7/fhir/r4/test/CDARoundTripTests.java | 3 ++- .../fhir/r4/test/ProfileUtilitiesTests.java | 2 +- .../r4/test/QuestionnaireBuilderTester.java | 2 +- .../fhir/r4/test/misc/StructureMapTests.java | 4 ++-- .../r4b/elementmodel/ObjectConverter.java | 2 +- .../org/hl7/fhir/r4b/elementmodel/Tester.java | 2 +- .../r4b/terminologies/LoincToDEConvertor.java | 1 - .../fhir/r4b/test/utils/TestingUtilities.java | 14 ++++---------- .../hl7/fhir/r4b/utils/DigitalSignatures.java | 3 ++- .../fhir/r4b/utils/MappingSheetParser.java | 10 +++++----- .../hl7/fhir/r4b/test/CDARoundTripTests.java | 2 +- .../org/hl7/fhir/r4b/test/ParsingTests.java | 3 ++- .../r4b/test/QuestionnaireBuilderTester.java | 2 +- .../fhir/r4b/test/misc/StructureMapTests.java | 4 ++-- .../fhir/utilities/npm/PackageScanner.java | 3 ++- .../utilities/tests/BaseTestingUtilities.java | 19 +++---------------- .../org/hl7/fhir/utilities/UtilitiesTest.java | 5 ++--- .../fhir/utilities/tests/XhtmlNodeTest.java | 2 +- .../conversion/tests/UtilitiesXTests.java | 14 +++++++------- 56 files changed, 112 insertions(+), 128 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/SpecDifferenceEvaluator.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/SpecDifferenceEvaluator.java index 167c46b44..c62189a70 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/SpecDifferenceEvaluator.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/SpecDifferenceEvaluator.java @@ -95,7 +95,7 @@ public class SpecDifferenceEvaluator { b.append(self.getDiffAsHtml(null)); b.append("\r\n"); b.append("\r\n"); - TextFile.stringToFile(b.toString(), "c:\\temp\\diff.html"); + TextFile.stringToFile(b.toString(), Utilities.path("[tmp]", "diff.html")); System.out.println("done"); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CKMImporter.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CKMImporter.java index baed5c0d8..3e4e3cecc 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CKMImporter.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CKMImporter.java @@ -105,7 +105,7 @@ public class CKMImporter { Document sxml = loadXml(ckm + "/services/ArchetypeFinderBean/getArchetypeInXML?archetypeId=" + id); Element e = XMLUtil.getFirstChild(sxml.getDocumentElement()); - String src = Utilities.path("c:\\temp", id + ".xml"); + String src = Utilities.path(Utilities.path("[tmp]"), id + ".xml"); TextFile.stringToFile(e.getTextContent(), src); } @@ -113,7 +113,7 @@ public class CKMImporter { System.out.println("Process " + id); String cfg = info == null ? null : Utilities.path(info, id + ".config"); - String src = Utilities.path("c:\\temp", id + ".xml"); + String src = Utilities.path(Utilities.path("[tmp]"), id + ".xml"); String dst = Utilities.path(dest, id + ".xml"); if (!new File(src).exists()) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICPC2Importer.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICPC2Importer.java index 096b37e6d..4f491eaa1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICPC2Importer.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICPC2Importer.java @@ -38,6 +38,7 @@ import org.hl7.fhir.dstu3.model.CodeSystem.ConceptDefinitionComponent; import org.hl7.fhir.dstu3.model.Enumerations.PublicationStatus; import org.hl7.fhir.dstu3.terminologies.CodeSystemUtilities; import org.hl7.fhir.exceptions.FHIRFormatError; +import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.xml.XMLUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -78,9 +79,9 @@ public class ICPC2Importer { public static void main(String[] args) { try { ICPC2Importer r = new ICPC2Importer(); - r.setSourceFileName("c:\\temp\\ICPC-2e-v5.0.xml"); - r.setTargetFileNameCS("C:\\temp\\icpc2.xml"); - r.setTargetFileNameVS("C:\\temp\\icpc2-vs.xml"); + r.setSourceFileName(Utilities.path("[tmp]", "ICPC-2e-v5.0.xml")); + r.setTargetFileNameCS(Utilities.path("[tmp]", "icpc2.xml")); + r.setTargetFileNameVS(Utilities.path("[tmp]", "icpc2-vs.xml")); r.go(); System.out.println("Completed OK"); } catch (Exception e) { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGPackConverter102.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGPackConverter102.java index d30c890c1..83647f13b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGPackConverter102.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGPackConverter102.java @@ -59,21 +59,21 @@ public class IGPackConverter102 extends BaseAdvisor_10_30 { private void process() throws IOException, FHIRException { initCSList(); - for (String s : new File("C:\\temp\\igpack2").list()) { + for (String s : new File(Utilities.path("[tmp]", "igpack2")).list()) { if (s.endsWith(".xml") && !s.startsWith("z-") && !Utilities.existsInList(s, "expansions.xml", "v3-codesystems.xml", "v2-tables.xml")) { System.out.println("process " + s); org.hl7.fhir.dstu2.formats.XmlParser xp = new org.hl7.fhir.dstu2.formats.XmlParser(); - org.hl7.fhir.dstu2.model.Resource r10 = xp.parse(new FileInputStream("C:\\temp\\igpack2\\" + s)); + org.hl7.fhir.dstu2.model.Resource r10 = xp.parse(new FileInputStream(Utilities.path("[tmp]", "igpack2\\" + s))); org.hl7.fhir.dstu3.model.Resource r17 = VersionConvertorFactory_10_30.convertResource(r10, this); org.hl7.fhir.dstu3.formats.XmlParser xc = new org.hl7.fhir.dstu3.formats.XmlParser(); xc.setOutputStyle(OutputStyle.PRETTY); - xc.compose(new FileOutputStream("C:\\temp\\igpack2\\" + s), r17); + xc.compose(new FileOutputStream(Utilities.path("[tmp]", "igpack2\\" + s)), r17); } } System.out.println("save codesystems"); org.hl7.fhir.dstu3.formats.XmlParser xc = new org.hl7.fhir.dstu3.formats.XmlParser(); xc.setOutputStyle(OutputStyle.PRETTY); - xc.compose(new FileOutputStream("C:\\temp\\igpack2\\codesystems.xml"), cslist); + xc.compose(new FileOutputStream(Utilities.path("[tmp]", "igpack2\\codesystems.xml")), cslist); System.out.println("done"); } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGPackConverter140.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGPackConverter140.java index c0b5faa0f..ee2074631 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGPackConverter140.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/IGPackConverter140.java @@ -32,6 +32,7 @@ package org.hl7.fhir.convertors.misc; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_14_30; import org.hl7.fhir.dstu3.formats.IParser.OutputStyle; +import org.hl7.fhir.utilities.Utilities; import java.io.File; import java.io.FileInputStream; @@ -40,16 +41,16 @@ import java.io.FileOutputStream; public class IGPackConverter140 { public static void main(String[] args) throws Exception { - for (String s : new File("C:\\temp\\igpack").list()) { + for (String s : new File(Utilities.path("[tmp]", "igpack")).list()) { // if (s.endsWith(".xml") && !s.contains("z-")) { if (s.equals("expansions.xml")) { System.out.println("process " + s); org.hl7.fhir.dstu2016may.formats.XmlParser xp = new org.hl7.fhir.dstu2016may.formats.XmlParser(); - org.hl7.fhir.dstu2016may.model.Resource r14 = xp.parse(new FileInputStream("C:\\temp\\igpack\\" + s)); + org.hl7.fhir.dstu2016may.model.Resource r14 = xp.parse(new FileInputStream(Utilities.path("[tmp]", "igpack\\" + s))); org.hl7.fhir.dstu3.model.Resource r17 = VersionConvertorFactory_14_30.convertResource(r14); org.hl7.fhir.dstu3.formats.XmlParser xc = new org.hl7.fhir.dstu3.formats.XmlParser(); xc.setOutputStyle(OutputStyle.PRETTY); - xc.compose(new FileOutputStream("C:\\temp\\igpack\\z-" + s), r17); + xc.compose(new FileOutputStream(Utilities.path("[tmp]", "igpack\\z-" + s)), r17); } } System.out.println("done"); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/NUCCConvertor.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/NUCCConvertor.java index a19aa5b67..1dca2f396 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/NUCCConvertor.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/NUCCConvertor.java @@ -56,7 +56,7 @@ public class NUCCConvertor { } public void execute() throws IOException, FHIRException { - CSVReader csv = new CSVReader(new FileInputStream("c:\\temp\\nucc.csv")); + CSVReader csv = new CSVReader(new FileInputStream(Utilities.path("[tmp]", "nucc.csv"))); CodeSystem cs = new CodeSystem(); cs.setId("nucc-provider-taxonomy"); cs.setUrl("http://nucc.org/provider-taxonomy"); @@ -79,7 +79,7 @@ public class NUCCConvertor { } csv.close(); cs.sort(); - new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\nucc.json"), cs); + new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "nucc.json")), cs); } private void processLine(CodeSystem cs, String[] values) throws FHIRFormatError { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ObservationStatsBuilder.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ObservationStatsBuilder.java index aea8d84ac..ac4e2e32a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ObservationStatsBuilder.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ObservationStatsBuilder.java @@ -38,6 +38,7 @@ import org.hl7.fhir.dstu3.model.Observation.ObservationComponentComponent; import org.hl7.fhir.dstu3.model.Observation.ObservationStatus; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRFormatError; +import org.hl7.fhir.utilities.Utilities; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -72,7 +73,7 @@ public class ObservationStatsBuilder { vitals(b, base, 130, 95, 133, 97, 37.2); vitals(b, base, 150, 85, 125, 98, 37.1); - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\vitals.xml"), b); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "vitals.xml")), b); } private static void vitals(Bundle b, Calendar base, int minutes, int diastolic, int systolic, int sat, double temp) throws FHIRFormatError { @@ -196,7 +197,7 @@ public class ObservationStatsBuilder { addAge(b, 10, 0, "31.9"); - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\obs.xml"), b); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "obs.xml")), b); } private static void addAge(Bundle b, int y, int m, String v) throws FHIRException { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/PhinVadsImporter.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/PhinVadsImporter.java index 4050a1b12..8c18746c5 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/PhinVadsImporter.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/PhinVadsImporter.java @@ -48,7 +48,7 @@ public class PhinVadsImporter extends OIDBasedValueSetImporter { // first thing do is split into 2 List parts = Utilities.splitBytes(source, "\r\n\r\n".getBytes()); if (parts.size() < 2) { - TextFile.bytesToFile(source, "c:\\temp\\phinvads.txt"); + TextFile.bytesToFile(source, Utilities.path("[tmp]", "phinvads.txt")); throw new FHIRException("Unable to parse phinvads value set: " + parts.size() + " parts found"); } CSVReader rdr = new CSVReader(new ByteArrayInputStream(parts.get(0))); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/iso21090/ISO21090Importer.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/iso21090/ISO21090Importer.java index 25d194752..d3b42faae 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/iso21090/ISO21090Importer.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/iso21090/ISO21090Importer.java @@ -121,7 +121,7 @@ public class ISO21090Importer { addParentProperties(sd.getSnapshot().getElement(), dt.getName(), dt.getParent(), false, true); produceProperties(sd.getSnapshot().getElement(), dt.getName(), dt.getProperties(), false, true); ed.getBase().setPath(ed.getPath()).setMin(ed.getMin()).setMax(ed.getMax()); - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\iso21090\\StructureDefinition-" + dt.getName() + ".xml"), sd); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "iso21090\\StructureDefinition-" + dt.getName() + ".xml")), sd); } private void addParentProperties(List elements, String name, String parent, boolean attrMode, boolean snapshot) throws FHIRFormatError { @@ -172,7 +172,7 @@ public class ISO21090Importer { for (String code : evs.getCodes()) { inc.addConcept().setCode(code); } - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\iso21090\\ValueSet-" + evs.getName() + ".xml"), vs); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "iso21090\\ValueSet-" + evs.getName() + ".xml")), vs); } private void processDataTypes() { diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/searchparam/SearchParameterProcessor.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/searchparam/SearchParameterProcessor.java index 5b6d9a630..f7e0fa9ff 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/searchparam/SearchParameterProcessor.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/searchparam/SearchParameterProcessor.java @@ -208,7 +208,7 @@ public class SearchParameterProcessor { } private void load4() throws FHIRFormatError, IOException { - org.hl7.fhir.r4.model.Bundle bundle = (org.hl7.fhir.r4.model.Bundle) new org.hl7.fhir.r4.formats.JsonParser().parse(new FileInputStream("c:\\temp\\sp4.json")); + org.hl7.fhir.r4.model.Bundle bundle = (org.hl7.fhir.r4.model.Bundle) new org.hl7.fhir.r4.formats.JsonParser().parse(new FileInputStream(Utilities.path("[tmp]", "sp4.json"))); for (org.hl7.fhir.r4.model.Bundle.BundleEntryComponent be : bundle.getEntry()) { org.hl7.fhir.r4.model.SearchParameter sp = (org.hl7.fhir.r4.model.SearchParameter) be.getResource(); for (org.hl7.fhir.r4.model.CodeType br : sp.getBase()) { @@ -221,7 +221,7 @@ public class SearchParameterProcessor { } private void load3() throws FHIRFormatError, IOException { - org.hl7.fhir.dstu3.model.Bundle bundle = (org.hl7.fhir.dstu3.model.Bundle) new org.hl7.fhir.dstu3.formats.JsonParser().parse(new FileInputStream("c:\\temp\\sp3.json")); + org.hl7.fhir.dstu3.model.Bundle bundle = (org.hl7.fhir.dstu3.model.Bundle) new org.hl7.fhir.dstu3.formats.JsonParser().parse(new FileInputStream(Utilities.path("[tmp]", "sp3.json"))); for (org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent be : bundle.getEntry()) { org.hl7.fhir.dstu3.model.SearchParameter sp = (org.hl7.fhir.dstu3.model.SearchParameter) be.getResource(); for (org.hl7.fhir.dstu3.model.CodeType br : sp.getBase()) { @@ -234,7 +234,7 @@ public class SearchParameterProcessor { } private void load2() throws FHIRFormatError, IOException { - org.hl7.fhir.dstu2.model.Bundle bundle = (org.hl7.fhir.dstu2.model.Bundle) new org.hl7.fhir.dstu2.formats.JsonParser().parse(new FileInputStream("c:\\temp\\sp2.json")); + org.hl7.fhir.dstu2.model.Bundle bundle = (org.hl7.fhir.dstu2.model.Bundle) new org.hl7.fhir.dstu2.formats.JsonParser().parse(new FileInputStream(Utilities.path("[tmp]", "sp2.json"))); for (org.hl7.fhir.dstu2.model.Bundle.BundleEntryComponent be : bundle.getEntry()) { org.hl7.fhir.dstu2.model.SearchParameter sp = (org.hl7.fhir.dstu2.model.SearchParameter) be.getResource(); String br = sp.getBase(); @@ -246,7 +246,7 @@ public class SearchParameterProcessor { } private void load2b() throws FHIRFormatError, IOException { - org.hl7.fhir.dstu2016may.model.Bundle bundle = (org.hl7.fhir.dstu2016may.model.Bundle) new org.hl7.fhir.dstu2016may.formats.JsonParser().parse(new FileInputStream("c:\\temp\\sp2b.json")); + org.hl7.fhir.dstu2016may.model.Bundle bundle = (org.hl7.fhir.dstu2016may.model.Bundle) new org.hl7.fhir.dstu2016may.formats.JsonParser().parse(new FileInputStream(Utilities.path("[tmp]", "sp2b.json"))); for (org.hl7.fhir.dstu2016may.model.Bundle.BundleEntryComponent be : bundle.getEntry()) { org.hl7.fhir.dstu2016may.model.SearchParameter sp = (org.hl7.fhir.dstu2016may.model.SearchParameter) be.getResource(); String br = sp.getBase(); diff --git a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/terminologies/LoincToDEConvertor.java b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/terminologies/LoincToDEConvertor.java index 0625601f0..a2e944b0b 100644 --- a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/terminologies/LoincToDEConvertor.java +++ b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/terminologies/LoincToDEConvertor.java @@ -70,7 +70,7 @@ import org.xmlpull.v1.XmlPullParserException; */ public class LoincToDEConvertor { - // C:\temp\LOINC.xml + public static void main(String[] args) throws FHIRFormatError, IOException, XmlPullParserException, SAXException, ParserConfigurationException { if (args.length == 0) { System.out.println("FHIR LOINC to CDE convertor. "); diff --git a/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/NarrativeGeneratorTests.java b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/NarrativeGeneratorTests.java index 59bfaeb21..2e1a3ab95 100644 --- a/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/NarrativeGeneratorTests.java +++ b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/NarrativeGeneratorTests.java @@ -10,6 +10,7 @@ import org.hl7.fhir.dstu2.utils.EOperationOutcome; import org.hl7.fhir.dstu2.utils.NarrativeGenerator; import org.hl7.fhir.dstu2.utils.SimpleWorkerContext; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.utilities.Utilities; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; @@ -39,7 +40,7 @@ public class NarrativeGeneratorTests { XmlParser p = new XmlParser(); DomainResource r = (DomainResource) p.parse(new FileInputStream(path)); gen.generate(r); - FileOutputStream s = new FileOutputStream("c:\\temp\\gen.xml"); + FileOutputStream s = new FileOutputStream(Utilities.path("[tmp]", "gen.xml")); new XmlParser().compose(s, r, true); s.close(); } diff --git a/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/ProfileUtilitiesTests.java b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/ProfileUtilitiesTests.java index 4ea59afc0..69a9a7fe6 100644 --- a/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/ProfileUtilitiesTests.java +++ b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/ProfileUtilitiesTests.java @@ -44,7 +44,7 @@ public class ProfileUtilitiesTests { // new ProfileUtilitiesTests().execute(args); new ProfileUtilitiesTests("C:\\work\\org.hl7.fhir\\build\\publish").testSnapshotGeneration(); // StructureDefinition p = (StructureDefinition) new XmlParser().parse(new FileInputStream("C:\\work\\org.hl7.fhir\\build\\publish\\lipid-report-cholesterol.profile.xml")); - // new ProfileUtilities(context, messages, null).generateSchematrons(new FileOutputStream("c:\\temp\\test.sch"), p); + // new ProfileUtilities(context, messages, null).generateSchematrons(new FileOutputStream(Utilities.path("[tmp]", "test.sch"), p); } public void execute(String[] args) throws FileNotFoundException, IOException, FHIRException { @@ -74,9 +74,9 @@ public class ProfileUtilitiesTests { System.out.println("processing output"); for (ProfileComparison outcome : comp.getComparisons()) { if (outcome.getSubset() != null) - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("C:\\temp\\intersection-"+outcome.getId()+".xml"), outcome.getSubset()); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "intersection-"+outcome.getId()+".xml")), outcome.getSubset()); if (outcome.getSuperset() != null) - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("C:\\temp\\union-"+outcome.getId()+".xml"), outcome.getSuperset()); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "union-"+outcome.getId()+".xml")), outcome.getSuperset()); System.out.println("\r\n"+outcome.getId()+": Comparison of "+outcome.getLeft().getUrl()+" and "+outcome.getRight().getUrl()); for (ValidationMessage vm : outcome.getMessages()) @@ -870,7 +870,7 @@ public class ProfileUtilitiesTests { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } diff --git a/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/QuestionnaireBuilderTester.java b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/QuestionnaireBuilderTester.java index 9d25d723e..75aec790f 100644 --- a/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/QuestionnaireBuilderTester.java +++ b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/QuestionnaireBuilderTester.java @@ -11,7 +11,7 @@ import org.hl7.fhir.exceptions.FHIRException; public class QuestionnaireBuilderTester { private static final String TEST_PROFILE_DIR = "C:\\work\\org.hl7.fhir\\build\\publish"; - private static final String TEST_DEST = "c:\\temp\\questionnaires\\"; +// private static final String TEST_DEST = Utilities.path("[tmp]", "questionnaires\\"); public static void main(String[] args) { QuestionnaireBuilder b = new QuestionnaireBuilder(null); diff --git a/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/TestingUtilities.java b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/TestingUtilities.java index 27107ef83..b1f8b2559 100644 --- a/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/TestingUtilities.java +++ b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/test/TestingUtilities.java @@ -40,7 +40,7 @@ public class TestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } @@ -161,7 +161,7 @@ public class TestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/metamodel/Tester.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/metamodel/Tester.java index 0f16a6495..21771ad2a 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/metamodel/Tester.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/metamodel/Tester.java @@ -63,7 +63,7 @@ public class Tester { // String tgt = normalise(TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".json"))); Element e = Manager.parse(context, new FileInputStream("C:\\work\\org.hl7.fhir\\build\\publish\\"+f), FhirFormat.XML); Manager.compose(context, e, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".mm.ttl")), FhirFormat.TURTLE, OutputStyle.PRETTY, null); - Manager.compose(context, e, new FileOutputStream("C:\\temp\\resource.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); + Manager.compose(context, e, new FileOutputStream(Utilities.path("[tmp]", "resource.xml")), FhirFormat.XML, OutputStyle.PRETTY, null); String src = TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".mm.ttl")); String tgt = TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".ttl")); t++; diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/terminologies/ICPC2Importer.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/terminologies/ICPC2Importer.java index ea85a971e..a0b9ffa31 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/terminologies/ICPC2Importer.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/terminologies/ICPC2Importer.java @@ -50,6 +50,7 @@ import org.hl7.fhir.dstu2016may.model.DateTimeType; import org.hl7.fhir.dstu2016may.model.Enumerations.ConformanceResourceStatus; import org.hl7.fhir.dstu2016may.model.Identifier; import org.hl7.fhir.dstu2016may.model.ValueSet; +import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.xml.XMLUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -67,9 +68,9 @@ public class ICPC2Importer { public static void main(String[] args) { try { ICPC2Importer r = new ICPC2Importer(); - r.setSourceFileName("c:\\temp\\ICPC-2e-v5.0.xml"); - r.setTargetFileNameCS("C:\\temp\\icpc2.xml"); - r.setTargetFileNameVS("C:\\temp\\icpc2-vs.xml"); + r.setSourceFileName(Utilities.path("[tmp]", "ICPC-2e-v5.0.xml")); + r.setTargetFileNameCS(Utilities.path("[tmp]", "icpc2.xml")); + r.setTargetFileNameVS(Utilities.path("[tmp]", "icpc2-vs.xml")); r.go(); System.out.println("Completed OK"); } catch (Exception e) { diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/terminologies/LoincToDEConvertor.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/terminologies/LoincToDEConvertor.java index 8ecbbf929..8a2a2032c 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/terminologies/LoincToDEConvertor.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/terminologies/LoincToDEConvertor.java @@ -70,7 +70,6 @@ import org.xmlpull.v1.XmlPullParserException; */ public class LoincToDEConvertor { - // C:\temp\LOINC.xml public static void main(String[] args) throws FHIRFormatError, IOException, XmlPullParserException, SAXException, ParserConfigurationException { if (args.length == 0) { System.out.println("FHIR LOINC to CDE convertor. "); diff --git a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/NarrativeGeneratorTests.java b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/NarrativeGeneratorTests.java index 220347348..55421c66c 100644 --- a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/NarrativeGeneratorTests.java +++ b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/NarrativeGeneratorTests.java @@ -6,6 +6,7 @@ import org.hl7.fhir.dstu2016may.utils.EOperationOutcome; import org.hl7.fhir.dstu2016may.utils.NarrativeGenerator; import org.hl7.fhir.dstu2016may.utils.SimpleWorkerContext; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.utilities.Utilities; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -38,7 +39,7 @@ public class NarrativeGeneratorTests { XmlParser p = new XmlParser(); DomainResource r = (DomainResource) p.parse(new FileInputStream(path)); gen.generate(r); - FileOutputStream s = new FileOutputStream("c:\\temp\\gen.xml"); + FileOutputStream s = new FileOutputStream(Utilities.path("[tmp]", "gen.xml")); new XmlParser().compose(s, r, true); s.close(); } diff --git a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/ParserTests.java b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/ParserTests.java index 753e9acf6..5803aac83 100644 --- a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/ParserTests.java +++ b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/ParserTests.java @@ -3,6 +3,7 @@ package org.hl7.fhir.dstu2016may.test; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; import org.hl7.fhir.dstu2016may.formats.IParser.OutputStyle; import org.hl7.fhir.dstu2016may.metamodel.Element; @@ -89,9 +90,9 @@ public class ParserTests { } int i = 0; - private String makeTempFilename() { + private String makeTempFilename() throws IOException { i++; - return "c:\\temp\\fhirtests\\"+Integer.toString(i)+".tmp"; + return Utilities.path("[tmp]", "fhirtests\\"+Integer.toString(i)+".tmp"); } } \ No newline at end of file diff --git a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/QuestionnaireBuilderTester.java b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/QuestionnaireBuilderTester.java index 368d1b838..2e0606f7f 100644 --- a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/QuestionnaireBuilderTester.java +++ b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/QuestionnaireBuilderTester.java @@ -11,7 +11,7 @@ import org.hl7.fhir.exceptions.FHIRException; public class QuestionnaireBuilderTester { private static final String TEST_PROFILE_DIR = "C:\\work\\org.hl7.fhir\\build\\publish"; - private static final String TEST_DEST = "c:\\temp\\questionnaires\\"; +// private static final String TEST_DEST = Utilities.path("[tmp]", "questionnaires\\"); public static void main(String[] args) { QuestionnaireBuilder b = new QuestionnaireBuilder(null); diff --git a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/RoundTripTest.java b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/RoundTripTest.java index a129f5a19..ebd317cee 100644 --- a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/RoundTripTest.java +++ b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/RoundTripTest.java @@ -97,9 +97,9 @@ public class RoundTripTest { } int i = 0; - private String makeTempFilename() { + private String makeTempFilename() throws IOException { i++; - return "c:\\temp\\fhirtests\\"+Integer.toString(i)+".tmp"; + return Utilities.path("[tmp]", "fhirtests\\"+Integer.toString(i)+".tmp"); } } \ No newline at end of file diff --git a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/StructureMapTests.java b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/StructureMapTests.java index 9f4301a88..bd1eeb133 100644 --- a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/StructureMapTests.java +++ b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/StructureMapTests.java @@ -105,7 +105,7 @@ public class StructureMapTests { Manager.compose(TestingUtilities.context, cda, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\guides\\ccda\\Example\\ccd.out.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); Bundle bundle = new Bundle(); scu.transform(null, cda, maps.get("http://hl7.org/fhir/StructureMap/cda"), bundle); - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\bundle.xml"), bundle); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "bundle.xml")), bundle); } } \ No newline at end of file diff --git a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/TestingUtilities.java b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/TestingUtilities.java index 3a73347b9..7f3e5a065 100644 --- a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/TestingUtilities.java +++ b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/test/TestingUtilities.java @@ -40,7 +40,7 @@ public class TestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } @@ -161,7 +161,7 @@ public class TestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/elementmodel/Tester.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/elementmodel/Tester.java index 4c0d8a870..29becb444 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/elementmodel/Tester.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/elementmodel/Tester.java @@ -63,7 +63,7 @@ public class Tester { // String tgt = normalise(TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".json"))); Element e = Manager.parse(context, new FileInputStream("C:\\work\\org.hl7.fhir\\build\\publish\\"+f), FhirFormat.XML); Manager.compose(context, e, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".mm.ttl")), FhirFormat.TURTLE, OutputStyle.PRETTY, null); - Manager.compose(context, e, new FileOutputStream("C:\\temp\\resource.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); + Manager.compose(context, e, new FileOutputStream(Utilities.path("[tmp]", "resource.xml")), FhirFormat.XML, OutputStyle.PRETTY, null); String src = TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".mm.ttl")); String tgt = TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".ttl")); t++; diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/LoincToDEConvertor.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/LoincToDEConvertor.java index 0b884e649..32759f787 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/LoincToDEConvertor.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/terminologies/LoincToDEConvertor.java @@ -70,7 +70,6 @@ import org.xmlpull.v1.XmlPullParserException; */ public class LoincToDEConvertor { - // C:\temp\LOINC.xml public static void main(String[] args) throws FHIRFormatError, IOException, XmlPullParserException, SAXException, ParserConfigurationException { if (args.length == 0) { System.out.println("FHIR LOINC to CDE convertor. "); diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/NarrativeGeneratorTests.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/NarrativeGeneratorTests.java index d8059509b..bf4a4f6bc 100644 --- a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/NarrativeGeneratorTests.java +++ b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/NarrativeGeneratorTests.java @@ -6,6 +6,7 @@ import org.hl7.fhir.dstu3.model.DomainResource; import org.hl7.fhir.dstu3.utils.EOperationOutcome; import org.hl7.fhir.dstu3.utils.NarrativeGenerator; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.utilities.Utilities; import org.junit.jupiter.api.*; import org.xmlpull.v1.XmlPullParserException; @@ -38,7 +39,7 @@ public class NarrativeGeneratorTests { XmlParser p = new XmlParser(); DomainResource r = (DomainResource) p.parse(new FileInputStream(path)); gen.generate(r); - FileOutputStream s = new FileOutputStream("c:\\temp\\gen.xml"); + FileOutputStream s = new FileOutputStream(Utilities.path("[tmp]", "gen.xml")); new XmlParser().compose(s, r, true); s.close(); diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/ProfileUtilitiesTests.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/ProfileUtilitiesTests.java index 7822b1a61..aad88c6ea 100644 --- a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/ProfileUtilitiesTests.java +++ b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/ProfileUtilitiesTests.java @@ -46,7 +46,7 @@ public class ProfileUtilitiesTests { // new ProfileUtilitiesTests().execute(args); new ProfileUtilitiesTests("C:\\work\\org.hl7.fhir\\build\\publish").testSnapshotGeneration(); // StructureDefinition p = (StructureDefinition) new XmlParser().parse(new FileInputStream("C:\\work\\org.hl7.fhir\\build\\publish\\lipid-report-cholesterol.profile.xml")); - // new ProfileUtilities(context, messages, null).generateSchematrons(new FileOutputStream("c:\\temp\\test.sch"), p); + // new ProfileUtilities(context, messages, null).generateSchematrons(new FileOutputStream(Utilities.path("[tmp]", "test.sch"), p); } public void execute(String[] args) throws FileNotFoundException, IOException, FHIRException { @@ -76,9 +76,9 @@ public class ProfileUtilitiesTests { System.out.println("processing output"); for (ProfileComparison outcome : comp.getComparisons()) { if (outcome.getSubset() != null) - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("C:\\temp\\intersection-"+outcome.getId()+".xml"), outcome.getSubset()); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "intersection-"+outcome.getId()+".xml")), outcome.getSubset()); if (outcome.getSuperset() != null) - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("C:\\temp\\union-"+outcome.getId()+".xml"), outcome.getSuperset()); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "union-"+outcome.getId()+".xml")), outcome.getSuperset()); System.out.println("\r\n"+outcome.getId()+": Comparison of "+outcome.getLeft().getUrl()+" and "+outcome.getRight().getUrl()); for (ValidationMessage vm : outcome.getMessages()) @@ -900,7 +900,7 @@ public class ProfileUtilitiesTests { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/QuestionnaireBuilderTester.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/QuestionnaireBuilderTester.java index 4786dd5cd..52b2e6369 100644 --- a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/QuestionnaireBuilderTester.java +++ b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/QuestionnaireBuilderTester.java @@ -11,7 +11,7 @@ import org.hl7.fhir.exceptions.FHIRException; public class QuestionnaireBuilderTester { private static final String TEST_PROFILE_DIR = "C:\\work\\org.hl7.fhir\\build\\publish"; - private static final String TEST_DEST = "c:\\temp\\questionnaires\\"; +// private static final String TEST_DEST = Utilities.path("[tmp]", "questionnaires\\"); public static void main(String[] args) { QuestionnaireBuilder b = new QuestionnaireBuilder(null); diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/SnapShotGenerationTests.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/SnapShotGenerationTests.java index 5fa2509f7..0c6498a89 100644 --- a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/SnapShotGenerationTests.java +++ b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/SnapShotGenerationTests.java @@ -88,7 +88,7 @@ public class SnapShotGenerationTests { context.fixtures.put(op.getResponseId(), output); context.snapshots.put(output.getUrl(), output); - new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("c:\\temp", op.getResponseId() + ".xml")), output); + new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(Utilities.path("[tmp]"), op.getResponseId() + ".xml")), output); //ok, now the asserts: for (int i = 1; i < test.getAction().size(); i++) { SetupActionAssertComponent a = test.getAction().get(i).getAssert(); diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/StructureMapTests.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/StructureMapTests.java index 8da4b8f5f..7de16bdb4 100644 --- a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/StructureMapTests.java +++ b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/StructureMapTests.java @@ -95,7 +95,7 @@ public class StructureMapTests { // Manager.compose(TestingUtilities.context, cda, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\guides\\ccda2\\mapping\\example\\ccd.out.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); // Bundle bundle = new Bundle(); // scu.transform(null, cda, maps.get("http://hl7.org/fhir/StructureMap/cda"), bundle); -// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\bundle.xml"), bundle); +// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "bundle.xml"), bundle); // } // // @Test @@ -125,7 +125,7 @@ public class StructureMapTests { // // List result = scu.analyse(null, maps.get("http://hl7.org/fhir/StructureMap/cda")).getProfiles(); // for (StructureDefinition sd : result) -// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\res-"+sd.getId()+".xml"), sd); +// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "res-"+sd.getId()+".xml"), sd); // } // } \ No newline at end of file diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/support/TestingUtilities.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/support/TestingUtilities.java index 73bb242c5..4371ea1a5 100644 --- a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/support/TestingUtilities.java +++ b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/support/TestingUtilities.java @@ -66,7 +66,7 @@ public class TestingUtilities extends BaseTestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } @@ -195,7 +195,7 @@ public class TestingUtilities extends BaseTestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/ObjectConverter.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/ObjectConverter.java index bed8761db..d5bae9c21 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/ObjectConverter.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/ObjectConverter.java @@ -123,7 +123,7 @@ public class ObjectConverter { ByteArrayOutputStream bo = new ByteArrayOutputStream(); try { new JsonParser(context).compose(element, bo, OutputStyle.NORMAL, null); -// TextFile.bytesToFile(bo.toByteArray(), "c:\\temp\\json.json"); +// TextFile.bytesToFile(bo.toByteArray(), Utilities.path("[tmp]", "json.json"); return new org.hl7.fhir.r4.formats.JsonParser().parse(bo.toByteArray()); } catch (IOException e) { // won't happen diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Tester.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Tester.java index d6d9a13cf..48d3ff06f 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Tester.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Tester.java @@ -63,7 +63,7 @@ public class Tester { // String tgt = normalise(TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".json"))); Element e = Manager.parse(context, new FileInputStream("C:\\work\\org.hl7.fhir\\build\\publish\\"+f), FhirFormat.XML); Manager.compose(context, e, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".mm.ttl")), FhirFormat.TURTLE, OutputStyle.PRETTY, null); - Manager.compose(context, e, new FileOutputStream("C:\\temp\\resource.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); + Manager.compose(context, e, new FileOutputStream(Utilities.path("[tmp]", "resource.xml")), FhirFormat.XML, OutputStyle.PRETTY, null); String src = TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".mm.ttl")); String tgt = TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".ttl")); t++; diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/terminologies/LoincToDEConvertor.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/terminologies/LoincToDEConvertor.java index 42ddc949e..e12d37888 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/terminologies/LoincToDEConvertor.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/terminologies/LoincToDEConvertor.java @@ -64,7 +64,6 @@ import org.xmlpull.v1.XmlPullParserException; */ public class LoincToDEConvertor { - // C:\temp\LOINC.xml public static void main(String[] args) throws FHIRFormatError, IOException, XmlPullParserException, SAXException, ParserConfigurationException { if (args.length == 0) { System.out.println("FHIR LOINC to CDE convertor. "); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java index 5fb2074a6..37a0a78ea 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java @@ -136,7 +136,7 @@ public class TestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } @@ -302,7 +302,7 @@ public class TestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } @@ -389,11 +389,6 @@ public class TestingUtilities { return null; } - public static String temp() { - if (new File("c:\\temp").exists()) - return "c:\\temp"; - return System.getProperty("java.io.tmpdir"); - } public static String checkTextIsSame(String s1, String s2) throws JsonSyntaxException, FileNotFoundException, IOException { return checkTextIsSame(s1,s2,true); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/DigitalSignatures.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/DigitalSignatures.java index 4eee3f67f..97ad45887 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/DigitalSignatures.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/DigitalSignatures.java @@ -60,6 +60,7 @@ import javax.xml.crypto.dsig.spec.TransformParameterSpec; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.xml.XmlGenerator; import org.w3c.dom.Document; @@ -114,7 +115,7 @@ public class DigitalSignatures { XMLSignature signature = fac.newXMLSignature(si, ki); signature.sign(dsc); - OutputStream os = new FileOutputStream("c:\\temp\\java-digsig.xml"); + OutputStream os = new FileOutputStream(Utilities.path("[tmp]", "java-digsig.xml")); new XmlGenerator().generate(doc.getDocumentElement(), os); } } \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/CDARoundTripTests.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/CDARoundTripTests.java index 921c4bbba..2ea512bd6 100644 --- a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/CDARoundTripTests.java +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/CDARoundTripTests.java @@ -8,6 +8,7 @@ import org.hl7.fhir.r4.elementmodel.Element; import org.hl7.fhir.r4.elementmodel.Manager; import org.hl7.fhir.r4.elementmodel.Manager.FhirFormat; import org.hl7.fhir.r4.formats.IParser.OutputStyle; +import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager; import org.hl7.fhir.utilities.npm.ToolsVersion; import org.junit.jupiter.api.BeforeAll; @@ -38,7 +39,7 @@ public class CDARoundTripTests { public void testDCI() throws FHIRFormatError, DefinitionException, FileNotFoundException, IOException, FHIRException { try { Element e = Manager.parse(context, new FileInputStream("C:\\work\\org.hl7.fhir.us\\ccda-to-fhir-maps\\cda\\IAT2-Discharge_Summary-DCI.xml"), FhirFormat.XML); - Manager.compose(context, e, new FileOutputStream("C:\\temp\\ccda.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); + Manager.compose(context, e, new FileOutputStream(Utilities.path("[tmp]", "ccda.xml")), FhirFormat.XML, OutputStyle.PRETTY, null); // Manager.compose(context, e, new FileOutputStream("C:\\work\\org.hl7.fhir.test\\ccda-to-fhir-maps\\testdocuments\\IAT2-Discharge_Summary-DCI.out.json"), FhirFormat.JSON, OutputStyle.PRETTY, null); // Manager.compose(context, e, new FileOutputStream("C:\\work\\org.hl7.fhir.test\\ccda-to-fhir-maps\\testdocuments\\IAT2-Discharge_Summary-DCI.out.ttl"), FhirFormat.TURTLE, OutputStyle.PRETTY, null); } catch (Exception e) { diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ProfileUtilitiesTests.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ProfileUtilitiesTests.java index fff927cf5..f74ee381c 100644 --- a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ProfileUtilitiesTests.java +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ProfileUtilitiesTests.java @@ -802,7 +802,7 @@ public class ProfileUtilitiesTests { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/QuestionnaireBuilderTester.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/QuestionnaireBuilderTester.java index 6e82ff0aa..2b37f2cad 100644 --- a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/QuestionnaireBuilderTester.java +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/QuestionnaireBuilderTester.java @@ -11,7 +11,7 @@ import java.io.FileInputStream; public class QuestionnaireBuilderTester { private static final String TEST_PROFILE_DIR = "C:\\work\\org.hl7.fhir\\build\\publish"; - private static final String TEST_DEST = "c:\\temp\\questionnaires\\"; +// private static final String TEST_DEST = Utilities.path("[tmp]", "questionnaires\\"); public static void main(String[] args) { QuestionnaireBuilder b = new QuestionnaireBuilder(null); diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/misc/StructureMapTests.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/misc/StructureMapTests.java index e90a67dd5..745616ecd 100644 --- a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/misc/StructureMapTests.java +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/misc/StructureMapTests.java @@ -135,7 +135,7 @@ public class StructureMapTests { // Manager.compose(TestingUtilities.context, cda, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\guides\\ccda2\\mapping\\example\\ccd.out.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); // Bundle bundle = new Bundle(); // scu.transform(null, cda, maps.get("http://hl7.org/fhir/StructureMap/cda"), bundle); -// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\bundle.xml"), bundle); +// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "bundle.xml"), bundle); // } // // @Test @@ -165,7 +165,7 @@ public class StructureMapTests { // // List result = scu.analyse(null, maps.get("http://hl7.org/fhir/StructureMap/cda")).getProfiles(); // for (StructureDefinition sd : result) -// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\res-"+sd.getId()+".xml"), sd); +// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "res-"+sd.getId()+".xml"), sd); // } // } \ No newline at end of file diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/ObjectConverter.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/ObjectConverter.java index cf13c333d..73d818ecf 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/ObjectConverter.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/ObjectConverter.java @@ -130,7 +130,7 @@ public class ObjectConverter { ByteArrayOutputStream bo = new ByteArrayOutputStream(); try { new JsonParser(context).compose(element, bo, OutputStyle.NORMAL, null); -// TextFile.bytesToFile(bo.toByteArray(), "c:\\temp\\json.json"); +// TextFile.bytesToFile(bo.toByteArray(), Utilities.path("[tmp]", "json.json"); return new org.hl7.fhir.r4b.formats.JsonParser().parse(bo.toByteArray()); } catch (IOException e) { // won't happen diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/Tester.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/Tester.java index 6f6713bbc..7f5cbf3e3 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/Tester.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/elementmodel/Tester.java @@ -65,7 +65,7 @@ public class Tester { // String tgt = normalise(TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".json"))); Element e = Manager.parseSingle(context, new FileInputStream("C:\\work\\org.hl7.fhir\\build\\publish\\"+f), FhirFormat.XML); Manager.compose(context, e, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".mm.ttl")), FhirFormat.TURTLE, OutputStyle.PRETTY, null); - Manager.compose(context, e, new FileOutputStream("C:\\temp\\resource.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); + Manager.compose(context, e, new FileOutputStream(Utilities.path("[tmp]", "resource.xml")), FhirFormat.XML, OutputStyle.PRETTY, null); String src = TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".mm.ttl")); String tgt = TextFile.fileToString("C:\\work\\org.hl7.fhir\\build\\publish\\"+Utilities.changeFileExt(f, ".ttl")); t++; diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/terminologies/LoincToDEConvertor.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/terminologies/LoincToDEConvertor.java index a557ca996..3ca090d20 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/terminologies/LoincToDEConvertor.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/terminologies/LoincToDEConvertor.java @@ -64,7 +64,6 @@ import org.xmlpull.v1.XmlPullParserException; */ public class LoincToDEConvertor { - // C:\temp\LOINC.xml public static void main(String[] args) throws FHIRFormatError, IOException, XmlPullParserException, SAXException, ParserConfigurationException { if (args.length == 0) { System.out.println("FHIR LOINC to CDE convertor. "); diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/test/utils/TestingUtilities.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/test/utils/TestingUtilities.java index f45d9a8bc..b164f0cf1 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/test/utils/TestingUtilities.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/test/utils/TestingUtilities.java @@ -156,7 +156,7 @@ public class TestingUtilities extends BaseTestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } } @@ -326,7 +326,7 @@ public class TestingUtilities extends BaseTestingUtilities { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("[tmp]"))); builder.start(); } @@ -410,12 +410,6 @@ public class TestingUtilities extends BaseTestingUtilities { return null; } - public static String temp() { - if (new File("c:\\temp").exists()) - return "c:\\temp"; - return System.getProperty("java.io.tmpdir"); - } - public static String checkTextIsSame(String s1, String s2) throws JsonSyntaxException, FileNotFoundException, IOException { return checkTextIsSame(s1, s2, true); } @@ -471,9 +465,9 @@ public class TestingUtilities extends BaseTestingUtilities { } public static String tempFolder(String name) throws IOException { - File tmp = new File("C:\\temp"); + File tmp = new File(Utilities.path("[tmp]")); if (tmp.exists() && tmp.isDirectory()) { - String path = Utilities.path("C:\\temp", name); + String path = Utilities.path(Utilities.path("[tmp]"), name); Utilities.createDirectory(path); return path; } else if (new File("/tmp").exists()) { diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/DigitalSignatures.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/DigitalSignatures.java index f0bce2ed9..3cba5efa7 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/DigitalSignatures.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/DigitalSignatures.java @@ -60,6 +60,7 @@ import javax.xml.crypto.dsig.spec.TransformParameterSpec; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.xml.XmlGenerator; import org.w3c.dom.Document; @@ -114,7 +115,7 @@ public class DigitalSignatures { XMLSignature signature = fac.newXMLSignature(si, ki); signature.sign(dsc); - OutputStream os = new FileOutputStream("c:\\temp\\java-digsig.xml"); + OutputStream os = new FileOutputStream(Utilities.path("[tmp]", "java-digsig.xml")); new XmlGenerator().generate(doc.getDocumentElement(), os); } } \ No newline at end of file diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/MappingSheetParser.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/MappingSheetParser.java index 0f0103db7..2e10faad2 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/MappingSheetParser.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/MappingSheetParser.java @@ -415,13 +415,13 @@ public class MappingSheetParser { private static final String SFX = ""; public static void main(String[] args) throws FileNotFoundException, IOException, FHIRException { MappingSheetParser parser = new MappingSheetParser(); - parser.parse(new FileInputStream("c:\\temp\\v2-pid.csv"), "v2-pid.csv"); + parser.parse(new FileInputStream(Utilities.path("[tmp]", "v2-pid.csv")), "v2-pid.csv"); ConceptMap cm = parser.getConceptMap(); StructureMap sm = parser.getStructureMap(); - new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\sm.json"), sm); - new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\cm.json"), cm); - TextFile.stringToFile(StructureMapUtilities.render(sm), "c:\\temp\\sm.txt"); - TextFile.stringToFile(PFX+parser.genSheet(cm)+SFX, "c:\\temp\\map.html"); + new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "sm.json")), sm); + new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "cm.json")), cm); + TextFile.stringToFile(StructureMapUtilities.render(sm), Utilities.path("[tmp]", "sm.txt")); + TextFile.stringToFile(PFX+parser.genSheet(cm)+SFX, Utilities.path("[tmp]", "map.html")); } } \ No newline at end of file diff --git a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/CDARoundTripTests.java b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/CDARoundTripTests.java index 43385ea23..735eed77c 100644 --- a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/CDARoundTripTests.java +++ b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/CDARoundTripTests.java @@ -136,7 +136,7 @@ public class CDARoundTripTests { // new FileInputStream("C:\\work\\org.hl7.fhir.us\\ccda-to-fhir-maps\\cda\\IAT2-Discharge_Summary-DCI.xml"), // FhirFormat.XML); // -// Manager.compose(context, e, new FileOutputStream("C:\\temp\\ccda.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); +// Manager.compose(context, e, new FileOutputStream(Utilities.path("[tmp]", "ccda.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); //// Manager.compose(context, e, new FileOutputStream("C:\\work\\org.hl7.fhir.test\\ccda-to-fhir-maps\\testdocuments\\IAT2-Discharge_Summary-DCI.out.json"), FhirFormat.JSON, OutputStyle.PRETTY, null); //// Manager.compose(context, e, new FileOutputStream("C:\\work\\org.hl7.fhir.test\\ccda-to-fhir-maps\\testdocuments\\IAT2-Discharge_Summary-DCI.out.ttl"), FhirFormat.TURTLE, OutputStyle.PRETTY, null); // } catch (Exception e) { diff --git a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/ParsingTests.java b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/ParsingTests.java index f592ea1a8..1739689d3 100644 --- a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/ParsingTests.java +++ b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/ParsingTests.java @@ -14,6 +14,7 @@ import org.hl7.fhir.r4b.formats.XmlParser; import org.hl7.fhir.r4b.model.Resource; import org.hl7.fhir.r4b.test.utils.TestingUtilities; import org.hl7.fhir.utilities.TextFile; +import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager; import org.hl7.fhir.utilities.npm.NpmPackage; import org.hl7.fhir.utilities.npm.ToolsVersion; @@ -54,7 +55,7 @@ public class ParsingTests { String src = new String(b); Resource r = new JsonParser().parse(b); b = new XmlParser().composeBytes(r); - TextFile.bytesToFile(b, "c:\\temp\\test.xml"); + TextFile.bytesToFile(b, Utilities.path("[tmp]", "test.xml")); r = new XmlParser().parse(b); b = new JsonParser().setOutputStyle(OutputStyle.PRETTY).composeBytes(r); String output = new String(b); diff --git a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/QuestionnaireBuilderTester.java b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/QuestionnaireBuilderTester.java index 679c28a0d..0487cf065 100644 --- a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/QuestionnaireBuilderTester.java +++ b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/QuestionnaireBuilderTester.java @@ -11,7 +11,7 @@ import org.hl7.fhir.r4b.utils.QuestionnaireBuilder; public class QuestionnaireBuilderTester { private static final String TEST_PROFILE_DIR = "C:\\work\\org.hl7.fhir\\build\\publish"; - private static final String TEST_DEST = "c:\\temp\\questionnaires\\"; +// private static final String TEST_DEST = Utilities.path("[tmp]", "questionnaires\\"); public static void main(String[] args) { QuestionnaireBuilder b = new QuestionnaireBuilder(null); diff --git a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/misc/StructureMapTests.java b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/misc/StructureMapTests.java index ddf72ef29..6eb6a1d61 100644 --- a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/misc/StructureMapTests.java +++ b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/misc/StructureMapTests.java @@ -135,7 +135,7 @@ public class StructureMapTests { // Manager.compose(TestingUtilities.context, cda, new FileOutputStream("C:\\work\\org.hl7.fhir\\build\\guides\\ccda2\\mapping\\example\\ccd.out.xml"), FhirFormat.XML, OutputStyle.PRETTY, null); // Bundle bundle = new Bundle(); // scu.transform(null, cda, maps.get("http://hl7.org/fhir/StructureMap/cda"), bundle); -// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\bundle.xml"), bundle); +// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "bundle.xml"), bundle); // } // // @Test @@ -165,7 +165,7 @@ public class StructureMapTests { // // List result = scu.analyse(null, maps.get("http://hl7.org/fhir/StructureMap/cda")).getProfiles(); // for (StructureDefinition sd : result) -// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream("c:\\temp\\res-"+sd.getId()+".xml"), sd); +// new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "res-"+sd.getId()+".xml"), sd); // } // } \ No newline at end of file diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageScanner.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageScanner.java index 12235b514..d08489940 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageScanner.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageScanner.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Set; import org.hl7.fhir.utilities.TextFile; +import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.json.JSONUtil; import org.hl7.fhir.utilities.json.JsonTrackingParser; @@ -29,7 +30,7 @@ public class PackageScanner { b.append("\r\n"); System.out.println(s); } - TextFile.stringToFile(b.toString(), "c:\\temp\\packages.csv"); + TextFile.stringToFile(b.toString(), Utilities.path("[tmp]", "packages.csv")); } public static void processServer(String server, List output, Set packages) throws IOException { diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/tests/BaseTestingUtilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/tests/BaseTestingUtilities.java index a86d06aeb..e6a4ddcaa 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/tests/BaseTestingUtilities.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/tests/BaseTestingUtilities.java @@ -108,21 +108,8 @@ public class BaseTestingUtilities { } public static String tempFolder(String name) throws IOException { - File tmp = new File("C:\\temp"); - if (tmp.exists() && tmp.isDirectory()) { - String path = Utilities.path("C:\\temp", name); - Utilities.createDirectory(path); - return path; - } else if (ToolGlobalSettings.hasTempPath()) { - return ToolGlobalSettings.getTempPath(); - } else if (new File("/tmp").exists()) { - String path = Utilities.path("/tmp", name); - Utilities.createDirectory(path); - return path; - } else { - String path = Utilities.path(System.getProperty("java.io.tmpdir"), name); - Utilities.createDirectory(path); - return path; - } + String path = ToolGlobalSettings.hasTempPath() ? ToolGlobalSettings.getTempPath() : Utilities.path("[tmp]", name); + Utilities.createDirectory(path); + return path; } } \ No newline at end of file diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java index c4486ac72..588c3ddee 100644 --- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java +++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java @@ -30,7 +30,6 @@ class UtilitiesTest { public static final String LINUX_USER_DIR = System.getProperty("user.home") + "/"; public static final String LINUX_JAVA_HOME = getNormalizedJavaHomeDir() + "/"; - public static final String WIN_TEMP_DIR = "c:\\temp\\"; public static final String WIN_USER_DIR = System.getProperty("user.home") + "\\"; public static final String WIN_JAVA_HOME = getNormalizedJavaHomeDir() + "\\"; @@ -91,9 +90,9 @@ class UtilitiesTest { } else if (os.contains(LINUX)) { return LINUX_TEMP_DIR; } else if (os.toUpperCase().contains(WINDOWS)) { - File tmp = new File("c:\\temp"); + File tmp = new File(Utilities.C_TEMP_DIR); if(tmp.exists()) { - return WIN_TEMP_DIR; + return Utilities.C_TEMP_DIR; } else { return System.getProperty("java.io.tmpdir"); } diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java index c05d25aba..26753c783 100644 --- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java +++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java @@ -79,7 +79,7 @@ public class XhtmlNodeTest { @Test public void testParseXXE() { XhtmlNode dt = new XhtmlNode(); - dt.setValueAsString("
\n ]>\n

This is some narrative &xxe;

\n
"); + dt.setValueAsString("
\n ]>\n

This is some narrative &xxe;

\n
"); } @Test diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/UtilitiesXTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/UtilitiesXTests.java index ae907092e..b3f75fae2 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/UtilitiesXTests.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/UtilitiesXTests.java @@ -167,7 +167,7 @@ public class UtilitiesXTests { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("tmp]"))); builder.start(); } @@ -333,7 +333,7 @@ public class UtilitiesXTests { command.add("\"" + diff + "\" \"" + f1 + "\" \"" + f2 + "\""); ProcessBuilder builder = new ProcessBuilder(command); - builder.directory(new CSFile("c:\\temp")); + builder.directory(new CSFile(Utilities.path("tmp]"))); builder.start(); } @@ -420,9 +420,9 @@ public class UtilitiesXTests { return null; } - public static String temp() { - if (new File("c:\\temp").exists()) - return "c:\\temp"; + public static String temp() throws IOException { + if (new File(Utilities.path("tmp]")).exists()) + return Utilities.path("tmp]"); return System.getProperty("java.io.tmpdir"); } @@ -549,9 +549,9 @@ public class UtilitiesXTests { } public static String tempFolder(String name) throws IOException { - File tmp = new File("C:\\temp"); + File tmp = new File(Utilities.path("tmp]")); if (tmp.exists() && tmp.isDirectory()) { - String path = Utilities.path("C:\\temp", name); + String path = Utilities.path("[tmp]", name); Utilities.createDirectory(path); return path; } else if (new File("/tmp").exists()) {