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

Remove dependency on newer commons-compress field to allow android to 

work
This commit is contained in:
James Agnew 2019-09-22 15:53:29 -04:00
parent 283b48fdde
commit 28f9c55463
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/context/BaseWorkerContext.java
View File

@ -34,7 +34,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.codec.Charsets; import ca.uhn.fhir.rest.api.Constants;
import org.hl7.fhir.dstu3.formats.IParser.OutputStyle; import org.hl7.fhir.dstu3.formats.IParser.OutputStyle;
import org.hl7.fhir.dstu3.formats.JsonParser; import org.hl7.fhir.dstu3.formats.JsonParser;
import org.hl7.fhir.dstu3.model.BooleanType; import org.hl7.fhir.dstu3.model.BooleanType;
@ -349,7 +349,7 @@ public abstract class BaseWorkerContext implements IWorkerContext {
ByteArrayOutputStream b = new ByteArrayOutputStream(); ByteArrayOutputStream b = new ByteArrayOutputStream();
parser.compose(b, vsid); parser.compose(b, vsid);
b.close(); b.close();
String s = new String(b.toByteArray(), Charsets.UTF_8); String s = new String(b.toByteArray(), Constants.CHARSET_UTF8);
// any code systems we can find, we add these too. // any code systems we can find, we add these too.
for (ConceptSetComponent inc : vs.getCompose().getInclude()) { for (ConceptSetComponent inc : vs.getCompose().getInclude()) {
CodeSystem cs = fetchCodeSystem(inc.getSystem()); CodeSystem cs = fetchCodeSystem(inc.getSystem());
@ -378,7 +378,7 @@ public abstract class BaseWorkerContext implements IWorkerContext {
ByteArrayOutputStream b = new ByteArrayOutputStream(); ByteArrayOutputStream b = new ByteArrayOutputStream();
parser.compose(b, csid); parser.compose(b, csid);
b.close(); b.close();
return new String(b.toByteArray(), Charsets.UTF_8); return new String(b.toByteArray(), Constants.CHARSET_UTF8);
} }

7
pom.xml
View File

@ -272,6 +272,13 @@
<maxmem>4000m</maxmem> <maxmem>4000m</maxmem>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<skipUpdateLicense>true</skipUpdateLicense>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>