honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix to support validating straight out of published IGs

This commit is contained in:
Grahame Grieve 2019-09-12 04:44:26 +10:00
parent 6494bcad71
commit faa4b82b2e
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java
View File

@ -63,6 +63,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.HttpURLConnection;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
@ -544,13 +545,16 @@ public class ValidationEngine {
//// ----- //// -----
// ok, having tried all that... now we'll just try to access it directly // ok, having tried all that... now we'll just try to access it directly
byte[] cnt;
if (stream == null) if (stream == null)
stream = fetchFromUrlSpecific(src, "application/json", true); cnt = fetchFromUrlSpecific(src, "application/json", true);
else
cnt = TextFile.streamToBytes(stream);
FhirFormat fmt = checkIsResource(stream, src); FhirFormat fmt = checkIsResource(cnt, src);
if (fmt != null) { if (fmt != null) {
Map<String, byte[]> res = new HashMap<String, byte[]>(); Map<String, byte[]> res = new HashMap<String, byte[]>();
res.put(Utilities.changeFileExt(src, "."+fmt.getExtension()), TextFile.fileToBytes(src)); res.put(Utilities.changeFileExt(src, "."+fmt.getExtension()), cnt);
return res; return res;
} }
throw new Exception("Unable to find/resolve/read -ig "+src); throw new Exception("Unable to find/resolve/read -ig "+src);
@ -569,12 +573,12 @@ public class ValidationEngine {
} }
} }
private InputStream fetchFromUrlSpecific(String source, String contentType, boolean optional) throws Exception { private byte[] fetchFromUrlSpecific(String source, String contentType, boolean optional) throws Exception {
try { try {
URL url = new URL(source+"?nocache=" + System.currentTimeMillis()); URL url = new URL(source+"?nocache=" + System.currentTimeMillis());
URLConnection c = url.openConnection(); HttpURLConnection conn = (HttpURLConnection) url.openConnection();
c.setRequestProperty("Content-Type", contentType); conn.setRequestProperty("Accept", contentType);
return c.getInputStream(); return TextFile.streamToBytes(conn.getInputStream());
} catch (Exception e) { } catch (Exception e) {
if (optional) if (optional)
return null; return null;
@ -693,25 +697,25 @@ public class ValidationEngine {
this.noInvariantChecks = value; this.noInvariantChecks = value;
} }
private FhirFormat checkIsResource(InputStream stream, String filename) { private FhirFormat checkIsResource(byte[] cnt, String filename) {
System.out.println(" ..Detect format for "+filename); System.out.println(" ..Detect format for "+filename);
try { try {
Manager.parse(context, stream, FhirFormat.XML); Manager.parse(context, new ByteArrayInputStream(cnt), FhirFormat.JSON);
return FhirFormat.XML;
} catch (Exception e) {
}
try {
Manager.parse(context, stream, FhirFormat.JSON);
return FhirFormat.JSON; return FhirFormat.JSON;
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
Manager.parse(context, stream, FhirFormat.TURTLE); Manager.parse(context, new ByteArrayInputStream(cnt),FhirFormat.XML);
return FhirFormat.XML;
} catch (Exception e) {
}
try {
Manager.parse(context, new ByteArrayInputStream(cnt),FhirFormat.TURTLE);
return FhirFormat.TURTLE; return FhirFormat.TURTLE;
} catch (Exception e) { } catch (Exception e) {
} }
try { try {
new StructureMapUtilities(context, null, null).parse(TextFile.streamToString(stream), null); new StructureMapUtilities(context, null, null).parse(TextFile.bytesToString(cnt), null);
return FhirFormat.TEXT; return FhirFormat.TEXT;
} catch (Exception e) { } catch (Exception e) {
} }
@ -720,7 +724,7 @@ public class ValidationEngine {
return null; return null;
} }
private FhirFormat checkIsResource(String path) throws FileNotFoundException { private FhirFormat checkIsResource(String path) throws IOException {
String ext = Utilities.getFileExtension(path); String ext = Utilities.getFileExtension(path);
if (Utilities.existsInList(ext, "xml")) if (Utilities.existsInList(ext, "xml"))
return FhirFormat.XML; return FhirFormat.XML;
@ -733,7 +737,7 @@ public class ValidationEngine {
if (Utilities.existsInList(ext, "txt")) if (Utilities.existsInList(ext, "txt"))
return FhirFormat.TEXT; return FhirFormat.TEXT;
return checkIsResource(new FileInputStream(path), path); return checkIsResource(TextFile.fileToBytes(path), path);
} }
public void connectToTSServer(String url, String log, FhirPublication version) throws URISyntaxException, FHIRException { public void connectToTSServer(String url, String log, FhirPublication version) throws URISyntaxException, FHIRException {