diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml index f40b7d60774a..a0b1410d9e3c 100644 --- a/hapi-fhir-base/src/changes/changes.xml +++ b/hapi-fhir-base/src/changes/changes.xml @@ -6,7 +6,7 @@ HAPI FHIR Changelog - + having multiple ways of accomplishing the same thing. This means that a number of existing classes have been deprocated in favour of new naming schemes. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java index 9271ac6abb69..42172d44ec15 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java @@ -38,7 +38,7 @@ public abstract class BaseHumanNameDt extends BaseIdentifiableElement { public abstract java.util.List getFamily(); /** - * Returns all repetitions of {@link $ hash}getFamily() family name} as a space separated string + * Returns all repetitions of {@link #getFamily() family name} as a space separated string * * @see DatatypeUtil${hash}joinStringsSpaceSeparated(List) */ @@ -56,7 +56,7 @@ public String getFamilyAsSingleString() { public abstract java.util.List getGiven(); /** - * Returns all repetitions of {@link $ hash}getGiven() given name} as a space separated string + * Returns all repetitions of {@link #getGiven() given name} as a space separated string * * @see DatatypeUtil${hash}joinStringsSpaceSeparated(List) */ @@ -74,7 +74,7 @@ public String getGivenAsSingleString() { public abstract java.util.List getPrefix(); /** - * Returns all repetitions of {@link $ hash}getPrefix() prefix name} as a space separated string + * Returns all repetitions of {@link #getPrefix() prefix name} as a space separated string * * @see DatatypeUtil${hash}joinStringsSpaceSeparated(List) */ @@ -92,7 +92,7 @@ public String getPrefixAsSingleString() { public abstract java.util.List getSuffix(); /** - * Returns all repetitions of {@link $ hash}Suffix() suffix} as a space separated string + * Returns all repetitions of {@link #getSuffix() suffix} as a space separated string * * @see DatatypeUtil${hash}joinStringsSpaceSeparated(List) */ diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java index e7d19400cdf0..016850120e15 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java @@ -74,9 +74,9 @@ public String getValueAsQueryToken() { /** - * Returns true if this identifier has the same {@link IdentifierDt#[[#]]#getValue() value} - * and {@link IdentifierDt#[[#]]#getSystem() system} (as compared by simple equals comparison). - * Does not compare other values (e.g. {@link IdentifierDt#[[#]]#getUse() use}) or any extensions. + * Returns true if this identifier has the same {@link IdentifierDt#getValue() value} + * and {@link IdentifierDt#getSystem() system} (as compared by simple equals comparison). + * Does not compare other values (e.g. {@link IdentifierDt#getUse() use}) or any extensions. */ public boolean matchesSystemAndValue(BaseIdentifierDt theIdentifier) { if (theIdentifier == null) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java index 2d8e66ba506c..05d42adb6502 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java @@ -20,7 +20,7 @@ * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.OutputStreamWriter; @@ -66,7 +66,6 @@ import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.method.BaseMethodBinding; import ca.uhn.fhir.rest.method.ConformanceMethodBinding; @@ -334,7 +333,7 @@ public Object getServerConformanceProvider() { /** * Gets the server's name, as exported in conformance profiles exported by the server. This is informational only, but can be helpful to set with something appropriate. * - * @see RestfulServer#setServerName(StringDt) + * @see RestfulServer#setServerName(String) */ public String getServerName() { return myServerName; @@ -791,9 +790,7 @@ public void setServerConformanceProvider(Object theServerConformanceProvider) { } /** - * Gets the server's name, as exported in conformance profiles exported by the server. This is informational only, but can be helpful to set with something appropriate. - * - * @see RestfulServer#setServerName(StringDt) + * Sets the server's name, as exported in conformance profiles exported by the server. This is informational only, but can be helpful to set with something appropriate. */ public void setServerName(String theServerName) { myServerName = theServerName; diff --git a/hapi-fhir-base/src/site/site.xml b/hapi-fhir-base/src/site/site.xml index 82cf4a7a5abc..f9e665fc252c 100644 --- a/hapi-fhir-base/src/site/site.xml +++ b/hapi-fhir-base/src/site/site.xml @@ -52,6 +52,10 @@ + + + + diff --git a/hapi-fhir-base/src/site/xdoc/index.xml b/hapi-fhir-base/src/site/xdoc/index.xml index c6a012b051f4..6023e1f2ad25 100644 --- a/hapi-fhir-base/src/site/xdoc/index.xml +++ b/hapi-fhir-base/src/site/xdoc/index.xml @@ -21,12 +21,34 @@

Note that this is the home for the FHIR version of HAPI. If you are - looking for HL7 v2 support, click here. + looking for HL7 v2 support, click here.

+ + +

+ A public test server is now operating at + http://fhirtest.uhn.ca. + This server is built entirely using components of HAPI-FHIR + and demonstrates all of its capabilities. +

+ + +
+ +

+ July 30, 2014 - HAPI FHIR 0.5 Released - HAPI 0.5 has now been released. + This is surprisingly soon after the last release (and probably not a + pace we will sustain) but we landed a number of big fixes and enhancements + over the last two weeks and it just didn't make sense to hold them. + See the upgrading page for information on + API changes in this release. +
+ - James Agnew +

July 14, 2014 - HAPI FHIR 0.4 Released - The next release of HAPI has been @@ -45,7 +67,7 @@
- James Agnew

- +
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component index af22db5d6d1a..28b7a0b1e2c5 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component +++ b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component @@ -6,10 +6,10 @@ - + uses - + uses diff --git a/restful-server-example/.settings/org.eclipse.wst.common.component b/restful-server-example/.settings/org.eclipse.wst.common.component index 631bbc5a7992..ef9460788ddb 100644 --- a/restful-server-example/.settings/org.eclipse.wst.common.component +++ b/restful-server-example/.settings/org.eclipse.wst.common.component @@ -3,7 +3,7 @@ - + uses