Add Google Errorprone compiler to build

hapi-fhir-android/dependency-reduced-pom.xml

@@ -94,7 +94,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.5.3</version>
+            <version>${maven_assembly_plugin_version}</version>
             <executions>
               <execution>
                 <phase>package</phase>
@@ -104,8 +104,8 @@
                 <configuration>
                   <attach>true</attach>
                   <descriptors>
-                    <descriptor>/Users/t3903uhn/git/hapi-fhir/hapi-fhir-android/src/assembly/android-sources.xml</descriptor>
+                    <descriptor>${project.basedir}/src/assembly/android-sources.xml</descriptor>
-                    <descriptor>/Users/t3903uhn/git/hapi-fhir/hapi-fhir-android/src/assembly/android-javadoc.xml</descriptor>
+                    <descriptor>${project.basedir}/src/assembly/android-javadoc.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java

@@ -454,6 +454,7 @@ public class FhirContext {
 	 * 
 	 * @deprecated Support for DEV resources will be removed, you should use DSTU2 resources instead 
 	 */
+	@Deprecated
 	public static FhirContext forDev() {
 		return new FhirContext(FhirVersionEnum.DEV);
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java

@@ -36,6 +36,7 @@ public abstract class BaseIdentifiableElement extends BaseElement implements IId
 	 * @deprecated Use {@link #getElementSpecificId()} instead. This method will be removed because it is easily
 	 *             confused with other ID methods (such as patient#getIdentifier)
 	 */
+	@Deprecated
 	@Override
 	public IdDt getId() {
 		if (myElementSpecificId == null) {
@@ -54,6 +55,7 @@ public abstract class BaseIdentifiableElement extends BaseElement implements IId
 	 * @deprecated Use {@link #setElementSpecificId(String)} instead. This method will be removed because it is easily
 	 *             confused with other ID methods (such as patient#getIdentifier)
 	 */
+	@Deprecated
 	@Override
 	public void setId(IdDt theId) {
 		if (theId == null) {
@@ -68,6 +70,7 @@ public abstract class BaseIdentifiableElement extends BaseElement implements IId
 	 *             confused with other ID methods (such as patient#getIdentifier)
 	 */
 	@Override
+	@Deprecated
 	public void setId(String theId) {
 		myElementSpecificId = theId;
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java

@@ -68,6 +68,7 @@ public class Bundle extends BaseBundle /* implements IElement */{
 	 * @deprecated Tags wil become immutable in a future release of HAPI, so
 	 *             {@link #addCategory(String, String, String)} should be used instead
 	 */
+	@Deprecated
 	public Tag addCategory() {
 		Tag retVal = new Tag();
 		getCategories().add(retVal);

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BundleEntry.java

@@ -67,6 +67,7 @@ public class BundleEntry extends BaseBundle {
 	 * @deprecated Tags wil become immutable in a future release of HAPI, so
 	 *             {@link #addCategory(String, String, String)} should be used instead
 	 */
+	@Deprecated
 	public Tag addCategory() {
 		Tag retVal = new Tag();
 		getCategories().add(retVal);
@@ -146,6 +147,7 @@ public class BundleEntry extends BaseBundle {
 	 *             if this entry represents a deleted resource, use {@link #setDeletedResourceId(IdDt)}.
 	 */
 	@Override
+	@Deprecated
 	public IdDt getId() {
 		return super.getId();
 	}
@@ -160,6 +162,7 @@ public class BundleEntry extends BaseBundle {
 	/**
 	 * @deprecated Use resource ID to determine base URL
 	 */
+	@Deprecated
 	public StringDt getLinkBase() {
 		if (myLinkBase == null) {
 			myLinkBase = new StringDt();
@@ -220,6 +223,7 @@ public class BundleEntry extends BaseBundle {
 	 *             DSTU2, it is recommended that you migrate code away from using this method and over to using resource
 	 *             metadata instead.
 	 */
+	@Deprecated
 	public InstantDt getUpdated() {
 		if (myUpdated == null) {
 			myUpdated = new InstantDt();
@@ -283,6 +287,7 @@ public class BundleEntry extends BaseBundle {
 	 * @deprecated Bundle entries no longer have an ID in DSTU2, as ID is explicitly stated in the resource itself.
 	 */
 	@Override
+	@Deprecated
 	public void setId(IdDt theId) {
 		super.setId(theId);
 	}
@@ -294,6 +299,7 @@ public class BundleEntry extends BaseBundle {
 	/**
 	 * @deprecated Use resource ID to determine base URL
 	 */
+	@Deprecated
 	public void setLinkBase(StringDt theLinkBase) {
 		myLinkBase = theLinkBase;
 	}
@@ -329,6 +335,7 @@ public class BundleEntry extends BaseBundle {
 	 *             DSTU2, it is recommended that you migrate code away from using this method and over to using resource
 	 *             metadata instead.
 	 */
+	@Deprecated
 	public void setUpdated(InstantDt theUpdated) {
 		Validate.notNull(theUpdated, "Updated may not be null");
 		myUpdated = theUpdated;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java

@@ -34,6 +34,7 @@ public interface IIdentifiableElement extends IElement {
 	 * @deprecated Use {@link #getElementSpecificId()} instead. This method will be removed because it is easily
 	 *             confused with other ID methods (such as patient#getIdentifier)
 	 */
+	@Deprecated
 	IdDt getId();
 
 	/**
@@ -46,12 +47,14 @@ public interface IIdentifiableElement extends IElement {
 	 * @deprecated Use {@link #setElementSpecificId(String)} instead. This method will be removed because it is easily
 	 *             confused with other ID methods (such as patient#getIdentifier)
 	 */
+	@Deprecated
 	void setId(IdDt theId);
 
 	/**
 	 * @deprecated Use {@link #setElementSpecificId(String)} instead. This method will be removed because it is easily
 	 *             confused with other ID methods (such as patient#getIdentifier)
 	 */
+	@Deprecated
 	void setId(String theId);
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PathSpecification.java

@@ -31,6 +31,7 @@ package ca.uhn.fhir.model.api;
  * 
  * @deprecated {@link Include} should be used instead
  */
+@Deprecated
 public class PathSpecification extends Include {
 
 	public PathSpecification(String theInclude) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java

@@ -61,12 +61,14 @@ public class Tag extends BaseElement implements IElement {
 	/**
 	 * @deprecated Tags will become immutable in a future release, so this constructor should not be used.
 	 */
+	@Deprecated
 	public Tag() {
 	}
 
 	/**
 	 * @deprecated There is no reason to create a tag with a term and not a scheme, so this constructor will be removed
 	 */
+	@Deprecated
 	public Tag(String theTerm) {
 		this((String) null, theTerm, null);
 	}
@@ -148,6 +150,7 @@ public class Tag extends BaseElement implements IElement {
 	 * ensuring that the TagList acts as an unordered set. Use the constructor to set this field when creating a new
 	 * tag object
 	 */
+	@Deprecated
 	public Tag setLabel(String theLabel) {
 		myLabel = theLabel;
 		return this;
@@ -160,6 +163,7 @@ public class Tag extends BaseElement implements IElement {
 	 * ensuring that the TagList acts as an unordered set. Use the constructor to set this field when creating a new
 	 * tag object
 	 */
+	@Deprecated
 	public Tag setScheme(String theScheme) {
 		myScheme = theScheme;
 		return this;
@@ -172,6 +176,7 @@ public class Tag extends BaseElement implements IElement {
 	 * ensuring that the TagList acts as an unordered set. Use the constructor to set this field when creating a new
 	 * tag object
 	 */
+	@Deprecated
 	public Tag setTerm(String theTerm) {
 		myTerm = theTerm;
 		return this;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java

@@ -79,6 +79,7 @@ public class TagList implements Set<Tag>, Serializable, IBase {
 	/**
 	 * @deprecated Tags wil become immutable in a future release of HAPI, so {@link #addTag(String, String, String)} should be used instead
 	 */
+	@Deprecated
 	public Tag addTag() {
 		myOrderedTags = null;
 		return addTag(null, null, null);

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java

@@ -181,6 +181,7 @@ public class IdDt extends UriDt implements IPrimitiveDatatype<String> {
 	/**
 	 * @deprecated Use {@link #getIdPartAsBigDecimal()} instead (this method was deprocated because its name is ambiguous)
 	 */
+	@Deprecated
 	public BigDecimal asBigDecimal() {
 		return getIdPartAsBigDecimal();
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/VersionIdParam.java

@@ -28,6 +28,7 @@ import java.lang.annotation.Target;
 /**
  * @deprecated IdDt can now hold both an ID and a version ID, so a single parameter with the {@link IdParam} annotation may be used 
  */
+@Deprecated
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.PARAMETER)
 public @interface VersionIdParam {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java

@@ -97,6 +97,7 @@ public class MethodOutcome {
 	/**
 	 * @deprecated Use the constructor which accepts a single IdDt parameter, and include the logical ID and version ID in that IdDt instance
 	 */
+	@Deprecated
 	public MethodOutcome(IdDt theId, IdDt theVersionId) {
 		myId = theId;
 		myVersionId = theVersionId;
@@ -105,6 +106,7 @@ public class MethodOutcome {
 	/**
 	 * @deprecated Use the constructor which accepts a single IdDt parameter, and include the logical ID and version ID in that IdDt instance
 	 */
+	@Deprecated
 	public MethodOutcome(IdDt theId, IdDt theVersionId, BaseOperationOutcome theBaseOperationOutcome) {
 		myId = theId;
 		myVersionId = theVersionId;
@@ -127,6 +129,7 @@ public class MethodOutcome {
 	/**
 	 * @deprecated {@link MethodOutcome#getId()} should return the complete ID including version if it is available
 	 */
+	@Deprecated
 	public IdDt getVersionId() {
 		return myVersionId;
 	}
@@ -173,6 +176,7 @@ public class MethodOutcome {
 	/**
 	 * @deprecated Put the ID and version ID into the same IdDt instance and pass it to {@link #setId(IdDt)}
 	 */
+	@Deprecated
 	public void setVersionId(IdDt theVersionId) {
 		myVersionId = theVersionId;
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/HttpBasicAuthInterceptor.java

@@ -38,6 +38,7 @@ import ca.uhn.fhir.rest.client.api.IBasicClient;
 /**
  * @deprecated Use {@link ca.uhn.fhir.rest.client.interceptor.BasicAuthInterceptor} instead. Note that BasicAuthInterceptor class is a HAPI client interceptor instead of being a commons-httpclient interceptor, so you register it to your client instance once it's created using {@link IGenericClient#registerInterceptor(IClientInterceptor)} or {@link IBasicClient#registerInterceptor(IClientInterceptor)} instead 
  */
+@Deprecated
 public class HttpBasicAuthInterceptor  implements HttpRequestInterceptor {
 
 	private String myUsername;

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/IGenericClient.java

@@ -66,6 +66,7 @@ public interface IGenericClient extends IRestfulClient {
 	 * @deprecated Use {@link #create() fluent method instead}. This method will be removed.
 	 * 
 	 */
+	@Deprecated
 	MethodOutcome create(IResource theResource);
 
 	/**
@@ -83,6 +84,7 @@ public interface IGenericClient extends IRestfulClient {
 	 * @return An outcome
 	 * @deprecated Use {@link #delete()} instead
 	 */
+	@Deprecated
 	MethodOutcome delete(Class<? extends IResource> theType, IdDt theId);
 
 	/**
@@ -95,6 +97,7 @@ public interface IGenericClient extends IRestfulClient {
 	 * @return An outcome
 	 * @deprecated Use {@link #delete()} instead
 	 */
+	@Deprecated
 	MethodOutcome delete(Class<? extends IResource> theType, String theId);
 
 	/**
@@ -125,6 +128,7 @@ public interface IGenericClient extends IRestfulClient {
 	 * @return A bundle containing returned resources
 	 * @deprecated As of 0.9, use the fluent {@link #history()} method instead
 	 */
+	@Deprecated
 	<T extends IResource> Bundle history(Class<T> theType, IdDt theId, DateTimeDt theSince, Integer theLimit);
 
 	/**
@@ -145,6 +149,7 @@ public interface IGenericClient extends IRestfulClient {
 	 * @return A bundle containing returned resources
 	 * @deprecated As of 0.9, use the fluent {@link #history()} method instead
 	 */
+	@Deprecated
 	<T extends IResource> Bundle history(Class<T> theType, String theId, DateTimeDt theSince, Integer theLimit);
 
 	/**
@@ -268,6 +273,7 @@ public interface IGenericClient extends IRestfulClient {
 	 * @deprecated Use {@link #transaction()}
 	 * 
 	 */
+	@Deprecated
 	List<IResource> transaction(List<IResource> theResources);
 
 	/**
@@ -341,6 +347,7 @@ public interface IGenericClient extends IRestfulClient {
 	 * @return The resource
 	 * @deprecated Deprecated in 0.7 - IdDt can contain an ID and a version, so this class doesn't make a lot of sense
 	 */
+	@Deprecated
 	<T extends IResource> T vread(Class<T> theType, IdDt theId, IdDt theVersionId);
 
 	/**

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeParam.java

@@ -25,6 +25,7 @@ package ca.uhn.fhir.rest.gclient;
  * @deprecated Use {@link CompositeClientParam} instead. That class is identical to this one but was renamed to reduce
  *             confusing duplicate names in the API. This class will be removed in a future release.
  */
+@Deprecated
 public class CompositeParam<A extends IParam, B extends IParam> extends CompositeClientParam<A,B> {
 
 	public CompositeParam(String theParamName) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateParam.java

@@ -25,6 +25,7 @@ package ca.uhn.fhir.rest.gclient;
  * @deprecated Use {@link DateClientParam} instead. That class is identical to this one but was renamed to reduct
  *             confusing duplicate names in the API. This class will be removed in a future release.
  */
+@Deprecated
 public class DateParam extends DateClientParam {
 
 	public DateParam(String theParamName) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java

@@ -35,6 +35,7 @@ public interface IClientExecutable<T extends IClientExecutable<?,?>, Y> {
 	 * 
 	 * @deprecated Use the client logging interceptor to log requests and responses instead. See <a href="http://jamesagnew.github.io/hapi-fhir/doc_rest_client.html#req_resp_logging">here</a> for more information.
 	 */
+	@Deprecated
 	T andLogRequestAndResponse(boolean theLogRequestAndResponse);
 
 	T prettyPrint();

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberParam.java

@@ -25,6 +25,7 @@ package ca.uhn.fhir.rest.gclient;
  * @deprecated Use {@link NumberClientParam} instead. That class is identical to this one but was renamed to reduct
  *             confusing duplicate names in the API. This class will be removed in a future release.
  */
+@Deprecated
 public class NumberParam extends NumberClientParam {
 
 	public NumberParam(String theParamName) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityParam.java

@@ -25,6 +25,7 @@ package ca.uhn.fhir.rest.gclient;
  * @deprecated Use {@link QuantityClientParam} instead. That class is identical to this one but was renamed to reduct
  *             confusing duplicate names in the API. This class will be removed in a future release.
  */
+@Deprecated
 public class QuantityParam extends QuantityClientParam {
 
 	public QuantityParam(String theParamName) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceParam.java

@@ -25,6 +25,7 @@ package ca.uhn.fhir.rest.gclient;
  * @deprecated Use {@link ReferenceClientParam} instead. That class is identical to this one but was renamed to reduct
  *             confusing duplicate names in the API. This class will be removed in a future release.
  */
+@Deprecated
 public class ReferenceParam extends ReferenceClientParam {
 
 	public ReferenceParam(String theParamName) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringParam.java

@@ -25,6 +25,7 @@ package ca.uhn.fhir.rest.gclient;
  * @deprecated Use {@link StringClientParam} instead. That class is identical to this one but was renamed to reduct
  *             confusing duplicate names in the API. This class will be removed in a future release.
  */
+@Deprecated
 public class StringParam extends StringClientParam {
 
 	public StringParam(String theParamName) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenParam.java

@@ -25,6 +25,7 @@ package ca.uhn.fhir.rest.gclient;
  * @deprecated Use {@link TokenClientParam} instead. That class is identical to this one but was renamed to reduct
  *             confusing duplicate names in the API. This class will be removed in a future release.
  */
+@Deprecated
 public class TokenParam extends TokenClientParam {
 
 	public TokenParam(String theParamName) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QualifiedDateParam.java

@@ -27,6 +27,7 @@ import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
 /**
  * @deprecated Use {@link DateParam} instead (this class is identical, but was renamed to be less confusing)
  */
+@Deprecated
 public class QualifiedDateParam extends DateParam {
 	/**
 	 * Constructor

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceNotFoundException.java

@@ -57,6 +57,7 @@ public class ResourceNotFoundException extends BaseServerResponseException {
 	/**
 	 * @deprecated This doesn't make sense, since an identifier is not a resource ID and shouldn't generate a 404 if it isn't found - Should be removed
 	 */
+	@Deprecated
 	public ResourceNotFoundException(Class<? extends IResource> theClass, BaseIdentifierDt theId) {
 		super(STATUS_CODE, "Resource of type " + theClass.getSimpleName() + " with ID " + theId + " is not known");
 	}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionNotSpecifiedException.java

@@ -21,13 +21,13 @@ package ca.uhn.fhir.rest.server.exceptions;
  */
 
 import ca.uhn.fhir.model.base.resource.BaseOperationOutcome;
-import ca.uhn.fhir.rest.annotation.Update;
 import ca.uhn.fhir.rest.server.Constants;
 
 /**
  * @deprecated Use {@link PreconditionFailedException} instead - This exception is
  * strangely named and will be removed at some point.
  */
+@Deprecated
 public class ResourceVersionNotSpecifiedException extends BaseServerResponseException {
 	public static final int STATUS_CODE = Constants.STATUS_HTTP_412_PRECONDITION_FAILED;
 	private static final long serialVersionUID = 1L;

pom.xml

@@ -217,11 +217,30 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.2</version>
+					<version>3.3</version>
 					<configuration>
 						<source>1.6</source>
 						<target>1.6</target>
+						<compilerId>javac-with-errorprone</compilerId>
+						<forceJavacCompilerUse>true</forceJavacCompilerUse>
 					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>com.google.errorprone</groupId>
+							<artifactId>error_prone_core</artifactId>
+							<version>2.0.1</version>
+						</dependency>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-compiler-javac</artifactId>
+							<version>2.5</version>
+						</dependency>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-compiler-javac-errorprone</artifactId>
+							<version>2.5</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -374,6 +393,26 @@
 										<ignore></ignore>
 									</action>
 								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-compiler-plugin
+										</artifactId>
+										<versionRange>
+											[3.3,)
+										</versionRange>
+										<goals>
+											<goal>compile</goal>
+											<goal>testCompile</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>