diff --git a/hapi-fhir-android/dependency-reduced-pom.xml b/hapi-fhir-android/dependency-reduced-pom.xml index 75c68235a10..1e0c0d8a940 100644 --- a/hapi-fhir-android/dependency-reduced-pom.xml +++ b/hapi-fhir-android/dependency-reduced-pom.xml @@ -94,7 +94,7 @@ maven-assembly-plugin - 2.5.3 + ${maven_assembly_plugin_version} package @@ -104,8 +104,8 @@ true - /Users/t3903uhn/git/hapi-fhir/hapi-fhir-android/src/assembly/android-sources.xml - /Users/t3903uhn/git/hapi-fhir/hapi-fhir-android/src/assembly/android-javadoc.xml + ${project.basedir}/src/assembly/android-sources.xml + ${project.basedir}/src/assembly/android-javadoc.xml diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java index d74a19163af..1615e41ea10 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java +++ b/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); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java index c424343dd70..1e6bbe6dcf9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java +++ b/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; } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java index fca80f95643..a57b1f79c96 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java +++ b/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); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BundleEntry.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BundleEntry.java index ebd1c926c2e..5818dc148c1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BundleEntry.java +++ b/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; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java index 63ff217c52d..691f260f38f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java +++ b/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); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PathSpecification.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PathSpecification.java index a18ca5bbc35..cd4dc5a70d1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/PathSpecification.java +++ b/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) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java index 7ae7284b3a0..1098dfbce47 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java +++ b/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; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java index a0ae718023d..2a38ca0c088 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java @@ -79,6 +79,7 @@ public class TagList implements Set, 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); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java index c7b646ddeb0..2d3a0bf8558 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java @@ -181,6 +181,7 @@ public class IdDt extends UriDt implements IPrimitiveDatatype { /** * @deprecated Use {@link #getIdPartAsBigDecimal()} instead (this method was deprocated because its name is ambiguous) */ + @Deprecated public BigDecimal asBigDecimal() { return getIdPartAsBigDecimal(); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/VersionIdParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/VersionIdParam.java index 82f2793ad05..185873a30ab 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/VersionIdParam.java +++ b/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 { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java index 4716262608c..63e58755f95 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java +++ b/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; } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/HttpBasicAuthInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/HttpBasicAuthInterceptor.java index 3ae60801c14..7075a70fe14 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/HttpBasicAuthInterceptor.java +++ b/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; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/IGenericClient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/IGenericClient.java index fb36b5dc1ef..eabef4c4ed0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/IGenericClient.java +++ b/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 theType, IdDt theId); /** @@ -95,6 +97,7 @@ public interface IGenericClient extends IRestfulClient { * @return An outcome * @deprecated Use {@link #delete()} instead */ + @Deprecated MethodOutcome delete(Class 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 Bundle history(Class 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 Bundle history(Class theType, String theId, DateTimeDt theSince, Integer theLimit); /** @@ -268,6 +273,7 @@ public interface IGenericClient extends IRestfulClient { * @deprecated Use {@link #transaction()} * */ + @Deprecated List transaction(List 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 vread(Class theType, IdDt theId, IdDt theVersionId); /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeParam.java index 55dbf9e59d7..b5f0f8607c2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeParam.java +++ b/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 extends CompositeClientParam { public CompositeParam(String theParamName) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateParam.java index de2abbfa75f..2623c4493fc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/DateParam.java +++ b/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) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java index 3530ef7635f..99f20c0913f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java @@ -35,6 +35,7 @@ public interface IClientExecutable, Y> { * * @deprecated Use the client logging interceptor to log requests and responses instead. See here for more information. */ + @Deprecated T andLogRequestAndResponse(boolean theLogRequestAndResponse); T prettyPrint(); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberParam.java index 0b7b9ac0e12..32edde136f4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/NumberParam.java +++ b/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) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityParam.java index 20c5cf38e1f..05920ac81e9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityParam.java +++ b/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) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceParam.java index 89e7d4967d0..e0f53b377a6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ReferenceParam.java +++ b/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) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringParam.java index c9df9eeeb0d..81261ff54ce 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringParam.java +++ b/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) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenParam.java index d0fc95e03ba..994341b8ee3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenParam.java +++ b/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) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QualifiedDateParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QualifiedDateParam.java index 15ac41c3a4b..9277775927d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QualifiedDateParam.java +++ b/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 diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceNotFoundException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceNotFoundException.java index f577fb869b2..600cdd4d0c0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceNotFoundException.java +++ b/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 theClass, BaseIdentifierDt theId) { super(STATUS_CODE, "Resource of type " + theClass.getSimpleName() + " with ID " + theId + " is not known"); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionNotSpecifiedException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionNotSpecifiedException.java index 92a1c056849..7758c4611a6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/ResourceVersionNotSpecifiedException.java +++ b/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; diff --git a/pom.xml b/pom.xml index 7abf996f2f0..c35ab4ecb0e 100644 --- a/pom.xml +++ b/pom.xml @@ -217,11 +217,30 @@ org.apache.maven.plugins maven-compiler-plugin - 3.2 + 3.3 1.6 1.6 + javac-with-errorprone + true + + + com.google.errorprone + error_prone_core + 2.0.1 + + + org.codehaus.plexus + plexus-compiler-javac + 2.5 + + + org.codehaus.plexus + plexus-compiler-javac-errorprone + 2.5 + + org.apache.maven.plugins @@ -374,6 +393,26 @@ + + + + org.apache.maven.plugins + + + maven-compiler-plugin + + + [3.3,) + + + compile + testCompile + + + + + +