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

Fix compile issues and keep working on android build

This commit is contained in:
James Agnew 2015-08-06 13:13:03 -04:00
parent 215ad9b3dc
commit 43dd081098
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-android/pom.xml
View File

@ -38,13 +38,11 @@
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu</artifactId> <artifactId>hapi-fhir-structures-dstu</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.2-SNAPSHOT</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu2</artifactId> <artifactId>hapi-fhir-structures-dstu2</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.2-SNAPSHOT</version>
<scope>test</scope>
</dependency> </dependency>
<!-- <!--
<dependency> <dependency>
@ -115,7 +113,7 @@
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>${maven_failsafe_plugin_version}</version> <version>${maven_failsafe_plugin_version}</version>
<configuration> <configuration>
<classpathDependencyScopeExclude>compile+runtime+test</classpathDependencyScopeExclude> <classpathDependencyScopeExclude>compile+runtime+test+provided</classpathDependencyScopeExclude>
<additionalClasspathElements> <additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/hapi-fhir-android-${project.version}-dstu2.jar</additionalClasspathElement> <additionalClasspathElement>${project.build.directory}/hapi-fhir-android-${project.version}-dstu2.jar</additionalClasspathElement>
</additionalClasspathElements> </additionalClasspathElements>

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java
View File

@ -1643,7 +1643,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
} }
@Override @Override
public IClientExecutable returnBundle(Class theClass) { public IQuery returnBundle(Class theClass) {
if (theClass == null) { if (theClass == null) {
throw new NullPointerException("theClass must not be null"); throw new NullPointerException("theClass must not be null");
} }

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java
View File

@ -74,6 +74,6 @@ public interface IQuery<T> extends IClientExecutable<IQuery<T>, T>, IBaseQuery<I
* Request that the client return the specified bundle type, e.g. <code>org.hl7.fhir.instance.model.Bundle.class</code> * Request that the client return the specified bundle type, e.g. <code>org.hl7.fhir.instance.model.Bundle.class</code>
* or <code>ca.uhn.fhir.model.dstu2.resource.Bundle.class</code> * or <code>ca.uhn.fhir.model.dstu2.resource.Bundle.class</code>
*/ */
<B extends IBaseBundle> IClientExecutable<IQuery<B>, B> returnBundle(Class<B> theClass); <B extends IBaseBundle> IQuery<B> returnBundle(Class<B> theClass);
} }

3
src/changes/changes.xml
View File

@ -76,6 +76,9 @@
Avoid crash when parsing if an invalid child element is found in Avoid crash when parsing if an invalid child element is found in
a resource reference. a resource reference.
</action> </action>
<action type="add">
Create new android specialty libraries for DSTU1 and DSTU2
</action>
</release> </release>
<release version="1.1" date="2015-07-13"> <release version="1.1" date="2015-07-13">
<action type="add"> <action type="add">