Skip to content

Commit

Permalink
Merge eb7b405 into 98a0d5a
Browse files Browse the repository at this point in the history
  • Loading branch information
@SingingTree
SingingTree committed Aug 31, 2015
2 parents 98a0d5a + eb7b405 commit 9ea517c
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ public IParser newJsonParser() {
* cases to contain methods for each of the RESTful operations you wish to implement (e.g. "read ImagingStudy",
* "search Patient by identifier", etc.). This interface must extend {@link IRestfulClient} (or commonly its
* sub-interface {@link IBasicClient}). See the <a
* href="http://hl7api.sourceforge.net/hapi-fhir/doc_rest_client.html">RESTful Client</a> documentation for more
* href="http://jamesagnew.github.io/hapi-fhir/doc_rest_client.html">RESTful Client</a> documentation for more
* information on how to define this interface.
*
* <p>
Expand Down
4 changes: 2 additions & 2 deletions hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/AddTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
* Note that for a
* server implementation, the {@link #type()} annotation is optional if the
* method is defined in a <a href=
* "http://hl7api.sourceforge.net/hapi-fhir/doc_rest_server.html#resource_providers"
* "http://jamesagnew.github.io/hapi-fhir/doc_rest_server.html#resource_providers"
* >resource provider</a>, since the type is implied.</li>
* <li>
* To add tag(s) on the server <b>to the given version of the
Expand All @@ -61,7 +61,7 @@
* operation.
* Note that for a server implementation, the
* {@link #type()} annotation is optional if the method is defined in a <a href=
* "http://hl7api.sourceforge.net/hapi-fhir/doc_rest_server.html#resource_providers"
* "http://jamesagnew.github.io/hapi-fhir/doc_rest_server.html#resource_providers"
* >resource provider</a>, since the type is implied.</li>
* </ul>
*/
Expand Down
4 changes: 2 additions & 2 deletions hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/DeleteTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* Note that for a
* server implementation, the {@link #type()} annotation is optional if the
* method is defined in a <a href=
* "http://hl7api.sourceforge.net/hapi-fhir/doc_rest_server.html#resource_providers"
* "http://jamesagnew.github.io/hapi-fhir/doc_rest_server.html#resource_providers"
* >resource provider</a>, since the type is implied.</li>
* <li>
* To delete tag(s) on the server <b>to the given version of the
Expand All @@ -57,7 +57,7 @@
* to be deleted.
* Note that for a server implementation, the
* {@link #type()} annotation is optional if the method is defined in a <a href=
* "http://hl7api.sourceforge.net/hapi-fhir/doc_rest_server.html#resource_providers"
* "http://jamesagnew.github.io/hapi-fhir/doc_rest_server.html#resource_providers"
* >resource provider</a>, since the type is implied.</li>
* </ul>
*/
Expand Down
8 changes: 4 additions & 4 deletions hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/GetTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
* contain a {@link #type()} attribute, and the method should not have an ID or
* Version ID parameter. On server implementations, the method must be defined
* in a <a href=
* "http://hl7api.sourceforge.net/hapi-fhir/doc_rest_server.html#plain_providers"
* "http://jamesagnew.github.io/hapi-fhir/doc_rest_server.html#plain_providers"
* >plain provider</a>.</li>
* <li>
* To return a list of all tags on the server <b>for the given resource
* type</b>, this annotation should contain a {@link #type()} attribute
* specifying the resource type, and the method should not have an ID or Version
* ID parameter. Note that for a server implementation, the {@link #type()}
* annotation is optional if the method is defined in a <a href=
* "http://hl7api.sourceforge.net/hapi-fhir/doc_rest_server.html#resource_providers"
* "http://jamesagnew.github.io/hapi-fhir/doc_rest_server.html#resource_providers"
* >resource provider</a>, since the type is implied.</li>
* <li>
* To return a list of all tags on the server <b>for the given resource
Expand All @@ -55,7 +55,7 @@
* {@link IdDt} annotated with the {@link IdParam} annotation. Note that for a
* server implementation, the {@link #type()} annotation is optional if the
* method is defined in a <a href=
* "http://hl7api.sourceforge.net/hapi-fhir/doc_rest_server.html#resource_providers"
* "http://jamesagnew.github.io/hapi-fhir/doc_rest_server.html#resource_providers"
* >resource provider</a>, since the type is implied.</li>
* <li>
* To return a list of all tags on the server <b>for the given version of the
Expand All @@ -65,7 +65,7 @@
* annotation, <b>and</b> a parameter of type {@link IdDt} annotated with the
* {@link IdParam} annotation. Note that for a server implementation, the
* {@link #type()} annotation is optional if the method is defined in a <a href=
* "http://hl7api.sourceforge.net/hapi-fhir/doc_rest_server.html#resource_providers"
* "http://jamesagnew.github.io/hapi-fhir/doc_rest_server.html#resource_providers"
* >resource provider</a>, since the type is implied.</li>
* </ul>
*/
Expand Down
4 changes: 2 additions & 2 deletions hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/interceptor/BasicAuthInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
* HTTP interceptor to be used for adding HTTP basic auth username/password tokens
* to requests
* <p>
* See the <a href="http://hl7api.sourceforge.net/hapi-fhir/doc_rest_client.html#HTTP_Basic_Authorization">HAPI Documentation</a>
* See the <a href="http://jamesagnew.github.io/hapi-fhir/doc_rest_client_interceptor.html#Security_HTTP_Basic_Authorization">HAPI Documentation</a>
* for information on how to use this class.
* </p>
*/
public class BasicAuthInterceptor implements IClientInterceptor {

private String myUsername;
private String myPassword;

public BasicAuthInterceptor(String theUsername, String thePassword) {
super();
myUsername = theUsername;
Expand Down
2 changes: 1 addition & 1 deletion ...ir-base/src/main/java/ca/uhn/fhir/rest/client/interceptor/BearerTokenAuthInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* where the token portion (at the end of the header) is supplied by the invoking code.
* </p>
* <p>
* See the <a href="http://hl7api.sourceforge.net/hapi-fhir/doc_rest_client.html#HTTP_Basic_Authorization">HAPI Documentation</a> for information on how to use this class.
* See the <a href="http://jamesagnew.github.io/hapi-fhir/doc_rest_client_interceptor.html#Security_HTTP_Bearer_Token_Authorization">HAPI Documentation</a> for information on how to use this class.
* </p>
*/
public class BearerTokenAuthInterceptor implements IClientInterceptor {
Expand Down
4 changes: 0 additions & 4 deletions hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/interceptor/UserInfoInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@

/**
* HTTP interceptor to be used for adding HTTP headers containing user identifying info for auditing purposes to the request
* <p>
* See the <a href="http://hl7api.sourceforge.net/hapi-fhir/doc_rest_client.html#User_Info">HAPI Documentation</a>
* for information on how to use this class.
* </p>
*/
public class UserInfoInterceptor implements IClientInterceptor {

Expand Down
4 changes: 4 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@
<id>pukkaone</id>
<name>Chin Huang</name>
</developer>
<developer>
<id>SingingTree</id>
<name>Bryce Van Dyk</name>
</developer>
</developers>

<licenses>
Expand Down

0 comments on commit 9ea517c

Please sign in to comment.