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 error in Accept header fetching packages

This commit is contained in:
Grahame Grieve 2020-04-21 13:56:09 +10:00
parent e6a62008de
commit d6f267781f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageClient.java vendored
View File

@ -66,7 +66,7 @@ public class PackageClient {
} }
@Override @Override
public String toString() { public String toString() {
return id+"#"+(version == null ? "??" : version)+(fhirVersion == null ? "": " ("+canonical+") for FHIR "+fhirVersion)+(url == null ? "" : " @"+url)+(description == null ? "" : " '"+description+"'"); return id+"#"+(version == null ? "?pc-pi?" : version)+(fhirVersion == null ? "": " ("+canonical+") for FHIR "+fhirVersion)+(url == null ? "" : " @"+url)+(description == null ? "" : " '"+description+"'");
} }
} }
@ -89,15 +89,15 @@ public class PackageClient {
} }
public InputStream fetch(String id, String ver) throws IOException { public InputStream fetch(String id, String ver) throws IOException {
return fetchUrl(Utilities.pathURL(address, id, ver)); return fetchUrl(Utilities.pathURL(address, id, ver), null);
} }
public InputStream fetch(PackageInfo info) throws IOException { public InputStream fetch(PackageInfo info) throws IOException {
return fetchUrl(Utilities.pathURL(address, info.getId(), info.getVersion())); return fetchUrl(Utilities.pathURL(address, info.getId(), info.getVersion()), null);
} }
public InputStream fetchNpm(String id, String ver) throws IOException { public InputStream fetchNpm(String id, String ver) throws IOException {
return fetchUrl(Utilities.pathURL(address, id, "-", id+"-"+ver+".tgz")); return fetchUrl(Utilities.pathURL(address, id, "-", id+"-"+ver+".tgz"), null);
} }
public List<PackageInfo> getVersions(String id) throws IOException { public List<PackageInfo> getVersions(String id) throws IOException {
@ -154,20 +154,23 @@ public class PackageClient {
return null; return null;
} }
private InputStream fetchUrl(String source) throws IOException { private InputStream fetchUrl(String source, String accept) throws IOException {
URL url = new URL(source); URL url = new URL(source);
URLConnection c = url.openConnection(); URLConnection c = url.openConnection();
if (accept != null) {
c.setRequestProperty("accept", accept);
}
return c.getInputStream(); return c.getInputStream();
} }
private JsonObject fetchJson(String source) throws IOException { private JsonObject fetchJson(String source) throws IOException {
String src = TextFile.streamToString(fetchUrl(source)); String src = TextFile.streamToString(fetchUrl(source, "application/json"));
//System.out.println(src); //System.out.println(src);
return (JsonObject) new com.google.gson.JsonParser().parse(src); return (JsonObject) new com.google.gson.JsonParser().parse(src);
} }
private JsonArray fetchJsonArray(String source) throws IOException { private JsonArray fetchJsonArray(String source) throws IOException {
String src = TextFile.streamToString(fetchUrl(source)); String src = TextFile.streamToString(fetchUrl(source, "application/json"));
//System.out.println(src); //System.out.println(src);
return (JsonArray) new com.google.gson.JsonParser().parse(src); return (JsonArray) new com.google.gson.JsonParser().parse(src);
} }