Add GZip support to client and server for client-to-server uploads
This commit is contained in:
jamesagnew
parent
d47e0e5e77
commit
07078e4ce3
|
|
@ -7,6 +7,7 @@ import ca.uhn.fhir.rest.client.api.IBasicClient;
|
|||
import ca.uhn.fhir.rest.client.interceptor.BasicAuthInterceptor;
|
||||
import ca.uhn.fhir.rest.client.interceptor.BearerTokenAuthInterceptor;
|
||||
import ca.uhn.fhir.rest.client.interceptor.CookieInterceptor;
|
||||
import ca.uhn.fhir.rest.client.interceptor.GZipContentInterceptor;
|
||||
import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
|
||||
import ca.uhn.fhir.rest.server.EncodingEnum;
|
||||
|
||||
|
|
@ -90,6 +91,18 @@ public class ClientExamples {
|
|||
// END SNIPPET: cookie
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public void gzip() {
|
||||
// START SNIPPET: gzip
|
||||
// Create a context and get the client factory so it can be configured
|
||||
FhirContext ctx = FhirContext.forDstu2();
|
||||
IRestfulClientFactory clientFactory = ctx.getRestfulClientFactory();
|
||||
|
||||
// Register the interceptor with your client (either style)
|
||||
IPatientClient annotationClient = ctx.newRestfulClient(IPatientClient.class, "http://localhost:9999/fhir");
|
||||
annotationClient.registerInterceptor(new GZipContentInterceptor());
|
||||
// END SNIPPET: gzip
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public void createSecurityBearer() {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.annotation;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.annotation;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
package ca.uhn.fhir.rest.client.interceptor;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.zip.GZIPOutputStream;
|
||||
|
||||
import org.apache.http.Header;
|
||||
import org.apache.http.HttpEntityEnclosingRequest;
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.apache.http.client.methods.HttpRequestBase;
|
||||
import org.apache.http.entity.ByteArrayEntity;
|
||||
|
||||
import ca.uhn.fhir.rest.client.IClientInterceptor;
|
||||
import ca.uhn.fhir.rest.server.Constants;
|
||||
|
||||
/**
|
||||
* Client interceptor which GZip compresses outgoing (POST/PUT) contents being uploaded
|
||||
* from the client to the server. This can improve performance by reducing network
|
||||
* load time.
|
||||
*/
|
||||
public class GZipContentInterceptor implements IClientInterceptor {
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(GZipContentInterceptor.class);
|
||||
|
||||
@Override
|
||||
public void interceptRequest(HttpRequestBase theRequest) {
|
||||
if (theRequest instanceof HttpEntityEnclosingRequest) {
|
||||
Header[] encodingHeaders = theRequest.getHeaders(Constants.HEADER_CONTENT_ENCODING);
|
||||
if (encodingHeaders == null || encodingHeaders.length == 0) {
|
||||
HttpEntityEnclosingRequest req = (HttpEntityEnclosingRequest)theRequest;
|
||||
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
GZIPOutputStream gos;
|
||||
try {
|
||||
gos = new GZIPOutputStream(bos);
|
||||
req.getEntity().writeTo(gos);
|
||||
gos.finish();
|
||||
} catch (IOException e) {
|
||||
ourLog.warn("Failed to GZip outgoing content", e);
|
||||
return;
|
||||
}
|
||||
|
||||
byte[] byteArray = bos.toByteArray();
|
||||
ByteArrayEntity newEntity = new ByteArrayEntity(byteArray);
|
||||
req.setEntity(newEntity);
|
||||
req.addHeader(Constants.HEADER_CONTENT_ENCODING, "gzip");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void interceptResponse(HttpResponse theResponse) throws IOException {
|
||||
// nothing
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.method;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
public interface IRestfulHeader {
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.method;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import static org.apache.commons.lang3.StringUtils.isBlank;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.method;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.Writer;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ import ca.uhn.fhir.rest.server.IRestfulServerDefaults;
|
|||
|
||||
public abstract class RequestDetails {
|
||||
|
||||
private byte[] myRequestContents;
|
||||
private byte[] myRequestContents;
|
||||
private String myCompartmentName;
|
||||
private String myCompleteUrl;
|
||||
private String myFhirServerBase;
|
||||
|
|
@ -54,7 +54,7 @@ public abstract class RequestDetails {
|
|||
private String mySecondaryOperation;
|
||||
private Map<String, List<String>> myUnqualifiedToQualifiedNames;
|
||||
private IRestfulResponse myResponse;
|
||||
|
||||
|
||||
public String getCompartmentName() {
|
||||
return myCompartmentName;
|
||||
}
|
||||
|
|
@ -65,6 +65,7 @@ public abstract class RequestDetails {
|
|||
|
||||
/**
|
||||
* The fhir server base url, independant of the query being executed
|
||||
*
|
||||
* @return the fhir server base url
|
||||
*/
|
||||
public String getFhirServerBase() {
|
||||
|
|
@ -192,66 +193,64 @@ public abstract class RequestDetails {
|
|||
mySecondaryOperation = theSecondaryOperation;
|
||||
}
|
||||
|
||||
public IRestfulResponse getResponse() {
|
||||
return myResponse;
|
||||
}
|
||||
public IRestfulResponse getResponse() {
|
||||
return myResponse;
|
||||
}
|
||||
|
||||
public void setResponse(IRestfulResponse theResponse) {
|
||||
this.myResponse = theResponse;
|
||||
}
|
||||
public void setResponse(IRestfulResponse theResponse) {
|
||||
this.myResponse = theResponse;
|
||||
}
|
||||
|
||||
public abstract String getHeader(String name);
|
||||
|
||||
public final byte[] loadRequestContents(RequestDetails theRequest) {
|
||||
public abstract String getHeader(String name);
|
||||
|
||||
public final byte[] loadRequestContents() {
|
||||
if (myRequestContents == null) {
|
||||
myRequestContents = getByteStreamRequestContents();
|
||||
}
|
||||
return myRequestContents;
|
||||
}
|
||||
|
||||
protected abstract byte[] getByteStreamRequestContents();
|
||||
protected abstract byte[] getByteStreamRequestContents();
|
||||
|
||||
public abstract List<String> getHeaders(String name);
|
||||
public abstract List<String> getHeaders(String name);
|
||||
|
||||
/**
|
||||
* Retrieves the body of the request as character data using
|
||||
* a <code>BufferedReader</code>. The reader translates the character
|
||||
* data according to the character encoding used on the body.
|
||||
* Either this method or {@link #getInputStream} may be called to read the
|
||||
* body, not both.
|
||||
*
|
||||
* @return a <code>Reader</code> containing the body of the request
|
||||
*
|
||||
* @exception UnsupportedEncodingException if the character set encoding
|
||||
* used is not supported and the text cannot be decoded
|
||||
*
|
||||
* @exception IllegalStateException if {@link #getInputStream} method
|
||||
* has been called on this request
|
||||
*
|
||||
* @exception IOException if an input or output exception occurred
|
||||
*
|
||||
* @see javax.servlet.http.HttpServletRequest#getInputStream
|
||||
*/
|
||||
public abstract Reader getReader() throws IOException;
|
||||
/**
|
||||
* Retrieves the body of the request as character data using a <code>BufferedReader</code>. The reader translates the
|
||||
* character data according to the character encoding used on the body. Either this method or {@link #getInputStream}
|
||||
* may be called to read the body, not both.
|
||||
*
|
||||
* @return a <code>Reader</code> containing the body of the request
|
||||
*
|
||||
* @exception UnsupportedEncodingException
|
||||
* if the character set encoding used is not supported and the text cannot be decoded
|
||||
*
|
||||
* @exception IllegalStateException
|
||||
* if {@link #getInputStream} method has been called on this request
|
||||
*
|
||||
* @exception IOException
|
||||
* if an input or output exception occurred
|
||||
*
|
||||
* @see javax.servlet.http.HttpServletRequest#getInputStream
|
||||
*/
|
||||
public abstract Reader getReader() throws IOException;
|
||||
|
||||
/**
|
||||
* Retrieves the body of the request as binary data.
|
||||
* Either this method or {@link #getReader} may be called to
|
||||
* read the body, not both.
|
||||
*
|
||||
* @return a {@link InputStream} object containing
|
||||
* the body of the request
|
||||
*
|
||||
* @exception IllegalStateException if the {@link #getReader} method
|
||||
* has already been called for this request
|
||||
*
|
||||
* @exception IOException if an input or output exception occurred
|
||||
*/
|
||||
public abstract InputStream getInputStream() throws IOException;
|
||||
/**
|
||||
* Retrieves the body of the request as binary data. Either this method or {@link #getReader} may be called to read
|
||||
* the body, not both.
|
||||
*
|
||||
* @return a {@link InputStream} object containing the body of the request
|
||||
*
|
||||
* @exception IllegalStateException
|
||||
* if the {@link #getReader} method has already been called for this request
|
||||
*
|
||||
* @exception IOException
|
||||
* if an input or output exception occurred
|
||||
*/
|
||||
public abstract InputStream getInputStream() throws IOException;
|
||||
|
||||
/**
|
||||
* Returns the server base URL (with no trailing '/') for a given request
|
||||
*/
|
||||
public abstract String getServerBaseForRequest();
|
||||
/**
|
||||
* Returns the server base URL (with no trailing '/') for a given request
|
||||
*/
|
||||
public abstract String getServerBaseForRequest();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ public class ResourceParameter implements IParameter {
|
|||
}
|
||||
|
||||
public static Reader createRequestReader(RequestDetails theRequest, Charset charset) {
|
||||
Reader requestReader = new InputStreamReader(new ByteArrayInputStream(theRequest.loadRequestContents(theRequest)), charset);
|
||||
Reader requestReader = new InputStreamReader(new ByteArrayInputStream(theRequest.loadRequestContents()), charset);
|
||||
return requestReader;
|
||||
}
|
||||
|
||||
|
|
@ -179,7 +179,7 @@ public class ResourceParameter implements IParameter {
|
|||
String msg = ctx.getLocalizer().getMessage(ResourceParameter.class, "noContentTypeInRequest", restOperationType);
|
||||
throw new InvalidRequestException(msg);
|
||||
} else {
|
||||
requestReader = new InputStreamReader(new ByteArrayInputStream(theRequest.loadRequestContents(theRequest)), charset);
|
||||
requestReader = new InputStreamReader(new ByteArrayInputStream(theRequest.loadRequestContents()), charset);
|
||||
}
|
||||
} else {
|
||||
String msg = ctx.getLocalizer().getMessage(ResourceParameter.class, "invalidContentTypeInRequest", ctValue, restOperationType);
|
||||
|
|
@ -219,7 +219,7 @@ public class ResourceParameter implements IParameter {
|
|||
String ct = theRequest.getHeader(Constants.HEADER_CONTENT_TYPE);
|
||||
IBaseBinary binary = (IBaseBinary) ctx.getResourceDefinition("Binary").newInstance();
|
||||
binary.setContentType(ct);
|
||||
binary.setContent(theRequest.loadRequestContents(theRequest));
|
||||
binary.setContent(theRequest.loadRequestContents());
|
||||
|
||||
retVal = binary;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.server;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.io.Writer;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.server;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
|
||||
public interface IRestfulServerDefaults {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.server;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import org.hl7.fhir.instance.model.api.IBaseResource;
|
||||
|
||||
import ca.uhn.fhir.rest.method.BaseMethodBinding;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.server;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import ca.uhn.fhir.model.api.IResource;
|
||||
import ca.uhn.fhir.rest.annotation.GetPage;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.server;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.server;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,28 @@
|
|||
package ca.uhn.fhir.rest.server.servlet;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.Reader;
|
||||
|
|
@ -9,17 +32,21 @@ import java.util.HashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.zip.GZIPInputStream;
|
||||
import java.util.zip.GZIPOutputStream;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.tools.ant.taskdefs.GUnzip;
|
||||
|
||||
import ca.uhn.fhir.context.ConfigurationException;
|
||||
import ca.uhn.fhir.rest.api.RequestTypeEnum;
|
||||
import ca.uhn.fhir.rest.method.BaseMethodBinding;
|
||||
import ca.uhn.fhir.rest.method.BaseMethodBinding.IRequestReader;
|
||||
import ca.uhn.fhir.rest.method.RequestDetails;
|
||||
import ca.uhn.fhir.rest.server.Constants;
|
||||
import ca.uhn.fhir.rest.server.RestfulServer;
|
||||
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
|
||||
|
||||
|
|
@ -72,6 +99,16 @@ public class ServletRequestDetails extends RequestDetails {
|
|||
try {
|
||||
InputStream inputStream = reader.getInputStream(this);
|
||||
requestContents = IOUtils.toByteArray(inputStream);
|
||||
|
||||
if (myServer.isUncompressIncomingContents()) {
|
||||
String contentEncoding = myServletRequest.getHeader(Constants.HEADER_CONTENT_ENCODING);
|
||||
if ("gzip".equals(contentEncoding)) {
|
||||
ourLog.debug("Uncompressing (GZip) incoming content");
|
||||
GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream(requestContents));
|
||||
requestContents = IOUtils.toByteArray(gis);
|
||||
}
|
||||
}
|
||||
|
||||
return requestContents;
|
||||
} catch (IOException e) {
|
||||
ourLog.error("Could not load request resource", e);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,25 @@
|
|||
package ca.uhn.fhir.rest.server.servlet;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR - Core Library
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import java.io.ByteArrayInputStream;
|
|||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
import java.net.URL;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
|
@ -25,21 +25,24 @@ import org.apache.http.client.methods.CloseableHttpResponse;
|
|||
import org.apache.http.client.methods.HttpGet;
|
||||
import org.apache.http.impl.client.CloseableHttpClient;
|
||||
import org.apache.http.impl.client.HttpClientBuilder;
|
||||
import org.fusesource.jansi.Ansi;
|
||||
import org.hl7.fhir.instance.model.api.IBase;
|
||||
import org.hl7.fhir.instance.model.api.IBaseResource;
|
||||
|
||||
import com.phloc.commons.io.file.FileUtils;
|
||||
|
||||
import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
|
||||
import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition;
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
import ca.uhn.fhir.model.api.IResource;
|
||||
import ca.uhn.fhir.model.dstu2.resource.Bundle;
|
||||
import ca.uhn.fhir.model.dstu2.resource.Bundle.Entry;
|
||||
import ca.uhn.fhir.model.dstu2.resource.Bundle.EntryRequest;
|
||||
import ca.uhn.fhir.model.dstu2.resource.SearchParameter;
|
||||
import ca.uhn.fhir.model.dstu2.valueset.BundleTypeEnum;
|
||||
import ca.uhn.fhir.model.dstu2.valueset.HTTPVerbEnum;
|
||||
import ca.uhn.fhir.model.primitive.IdDt;
|
||||
import ca.uhn.fhir.parser.DataFormatException;
|
||||
import ca.uhn.fhir.rest.client.IGenericClient;
|
||||
import ca.uhn.fhir.rest.client.interceptor.GZipContentInterceptor;
|
||||
import ca.uhn.fhir.util.ResourceReferenceInfo;
|
||||
|
||||
public class ExampleDataUploader extends BaseCommand {
|
||||
|
|
@ -75,6 +78,10 @@ public class ExampleDataUploader extends BaseCommand {
|
|||
opt.setRequired(false);
|
||||
options.addOption(opt);
|
||||
|
||||
opt = new Option("c", "cache", true, "Store a copy of the downloaded example pack on the local disk using a file of the given name. Use this file instead of fetching it from the internet if the file already exists.");
|
||||
opt.setRequired(false);
|
||||
options.addOption(opt);
|
||||
|
||||
return options;
|
||||
}
|
||||
|
||||
|
|
@ -121,8 +128,8 @@ public class ExampleDataUploader extends BaseCommand {
|
|||
}
|
||||
Bundle bundle = new Bundle();
|
||||
{
|
||||
|
||||
byte[] inputBytes = IOUtils.toByteArray(result.getEntity().getContent());
|
||||
byte[] inputBytes = readStreamFromInternet(result);
|
||||
|
||||
IOUtils.closeQuietly(result.getEntity().getContent());
|
||||
|
||||
ourLog.info("Successfully Loaded example pack ({} bytes)", inputBytes.length);
|
||||
|
|
@ -163,26 +170,23 @@ public class ExampleDataUploader extends BaseCommand {
|
|||
}
|
||||
ourLog.info("Found example {} - {} - {} chars", nextEntry.getName(), parsed.getClass().getSimpleName(), exampleString.length());
|
||||
|
||||
if (parsed instanceof Bundle) {
|
||||
Bundle b = (Bundle) parsed;
|
||||
if (b.getTypeElement().getValueAsEnum() != BundleTypeEnum.DOCUMENT) {
|
||||
continue;
|
||||
}
|
||||
if (ctx.getResourceDefinition(parsed).getName().equals("Bundle")) {
|
||||
BaseRuntimeChildDefinition entryChildDef = ctx.getResourceDefinition(parsed).getChildByName("entry");
|
||||
BaseRuntimeElementCompositeDefinition<?> entryDef = (BaseRuntimeElementCompositeDefinition<?>) entryChildDef.getChildByName("entry");
|
||||
|
||||
for (Entry nextEntry1 : b.getEntry()) {
|
||||
if (nextEntry1.getResource() == null) {
|
||||
for (IBase nextEntry1 : entryChildDef.getAccessor().getValues(parsed)) {
|
||||
List<IBase> resources = entryDef.getChildByName("resource").getAccessor().getValues(nextEntry1);
|
||||
if (resources == null) {
|
||||
continue;
|
||||
}
|
||||
if (nextEntry1.getResource() instanceof Bundle) {
|
||||
continue;
|
||||
for (IBase nextResource : resources) {
|
||||
if (!ctx.getResourceDefinition(parsed).getName().equals("Bundle") && ctx.getResourceDefinition(parsed).getName().equals("SearchParameter")) {
|
||||
bundle.addEntry().setRequest(new EntryRequest().setMethod(HTTPVerbEnum.POST)).setResource((IResource) nextResource);
|
||||
}
|
||||
}
|
||||
if (nextEntry1.getResource() instanceof SearchParameter) {
|
||||
continue;
|
||||
}
|
||||
bundle.addEntry().setRequest(new EntryRequest().setMethod(HTTPVerbEnum.POST)).setResource(nextEntry1.getResource());
|
||||
}
|
||||
} else {
|
||||
if (parsed instanceof SearchParameter) {
|
||||
if (ctx.getResourceDefinition(parsed).getName().equals("SearchParameter")) {
|
||||
continue;
|
||||
}
|
||||
bundle.addEntry().setRequest(new EntryRequest().setMethod(HTTPVerbEnum.POST)).setResource((IResource) parsed);
|
||||
|
|
@ -242,6 +246,7 @@ public class ExampleDataUploader extends BaseCommand {
|
|||
}
|
||||
next.getRequest().setMethod(HTTPVerbEnum.PUT);
|
||||
next.getRequest().setUrl(nextId);
|
||||
next.getResource().setId("");
|
||||
renames.put(originalId, nextId);
|
||||
}
|
||||
}
|
||||
|
|
@ -302,6 +307,7 @@ public class ExampleDataUploader extends BaseCommand {
|
|||
ourLog.info("Uploading bundle to server: " + targetServer);
|
||||
|
||||
IGenericClient fhirClient = newClient(ctx, targetServer);
|
||||
fhirClient.registerInterceptor(new GZipContentInterceptor());
|
||||
|
||||
long start = System.currentTimeMillis();
|
||||
;
|
||||
|
|
@ -312,4 +318,40 @@ public class ExampleDataUploader extends BaseCommand {
|
|||
}
|
||||
}
|
||||
|
||||
private byte[] readStreamFromInternet(CloseableHttpResponse result) throws IOException {
|
||||
byte[] inputBytes;
|
||||
{
|
||||
long maxLength = result.getEntity().getContentLength();
|
||||
int nextLog = -1;
|
||||
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
|
||||
int nRead;
|
||||
byte[] data = new byte[16384];
|
||||
while ((nRead = result.getEntity().getContent().read(data, 0, data.length)) != -1) {
|
||||
buffer.write(data, 0, nRead);
|
||||
if (buffer.size() > nextLog) {
|
||||
System.err.print("\r" + Ansi.ansi().eraseLine());
|
||||
System.err.print(FileUtils.getFileSizeDisplay(buffer.size(), 1));
|
||||
if (maxLength > 0) {
|
||||
System.err.print(" [");
|
||||
int stars = (int)(50.0f * ((float)buffer.size() / (float)maxLength));
|
||||
for (int i = 0; i < stars; i++) {
|
||||
System.err.print("*");
|
||||
}
|
||||
for (int i = stars; i < 50; i++) {
|
||||
System.err.print(" ");
|
||||
}
|
||||
System.err.print("]");
|
||||
}
|
||||
System.err.flush();
|
||||
nextLog += 100000;
|
||||
}
|
||||
}
|
||||
buffer.flush();
|
||||
inputBytes = buffer.toByteArray();
|
||||
}
|
||||
System.err.println();
|
||||
System.err.flush();
|
||||
return inputBytes;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,99 @@
|
|||
package ca.uhn.fhir.rest.client.interceptor;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.servlet.ServletHandler;
|
||||
import org.eclipse.jetty.servlet.ServletHolder;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.Before;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
import ca.uhn.fhir.model.api.IResource;
|
||||
import ca.uhn.fhir.model.dstu2.resource.Patient;
|
||||
import ca.uhn.fhir.model.primitive.IdDt;
|
||||
import ca.uhn.fhir.rest.annotation.Create;
|
||||
import ca.uhn.fhir.rest.annotation.ResourceParam;
|
||||
import ca.uhn.fhir.rest.api.MethodOutcome;
|
||||
import ca.uhn.fhir.rest.client.IGenericClient;
|
||||
import ca.uhn.fhir.rest.server.Constants;
|
||||
import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider;
|
||||
import ca.uhn.fhir.rest.server.IResourceProvider;
|
||||
import ca.uhn.fhir.rest.server.RestfulServer;
|
||||
import ca.uhn.fhir.util.PortUtil;
|
||||
|
||||
public class CompressOutgoingContentInterceptorTest {
|
||||
|
||||
private static IGenericClient ourClient;
|
||||
private static FhirContext ourCtx = FhirContext.forDstu2();
|
||||
private static Patient ourLastPatient;
|
||||
private static String ourLastReq;
|
||||
private static String ourLastResponseEncoding;
|
||||
private static int ourPort;
|
||||
private static Server ourServer;
|
||||
|
||||
@Before
|
||||
public void before() {
|
||||
ourClient = ourCtx.newRestfulGenericClient("http://localhost:" + ourPort);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreate() throws Exception {
|
||||
ourClient.registerInterceptor(new GZipContentInterceptor());
|
||||
|
||||
Patient p = new Patient();
|
||||
p.addName().addFamily("FAMILY");
|
||||
|
||||
ourClient.create().resource(p).execute();
|
||||
|
||||
assertEquals("FAMILY", p.getName().get(0).getFamily().get(0).getValue());
|
||||
assertEquals("gzip", ourLastReq);
|
||||
assertEquals("gzip", ourLastResponseEncoding);
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
public static void afterClass() throws Exception {
|
||||
ourServer.stop();
|
||||
}
|
||||
|
||||
@BeforeClass
|
||||
public static void beforeClass() throws Exception {
|
||||
ourPort = PortUtil.findFreePort();
|
||||
ourServer = new Server(ourPort);
|
||||
|
||||
DummyPatientResourceProvider patientProvider = new DummyPatientResourceProvider();
|
||||
|
||||
ServletHandler proxyHandler = new ServletHandler();
|
||||
RestfulServer servlet = new RestfulServer(ourCtx);
|
||||
servlet.setPagingProvider(new FifoMemoryPagingProvider(10));
|
||||
|
||||
servlet.setResourceProviders(patientProvider);
|
||||
ServletHolder servletHolder = new ServletHolder(servlet);
|
||||
proxyHandler.addServletWithMapping(servletHolder, "/*");
|
||||
ourServer.setHandler(proxyHandler);
|
||||
ourServer.start();
|
||||
|
||||
}
|
||||
|
||||
public static class DummyPatientResourceProvider implements IResourceProvider {
|
||||
|
||||
@Create
|
||||
public MethodOutcome create(HttpServletRequest theReq, @ResourceParam Patient thePatient) {
|
||||
ourLastReq = theReq.getHeader(Constants.HEADER_CONTENT_ENCODING.toLowerCase());
|
||||
ourLastResponseEncoding = theReq.getHeader(Constants.HEADER_ACCEPT_ENCODING.toLowerCase());
|
||||
ourLastPatient = thePatient;
|
||||
return new MethodOutcome(new IdDt("Patient", "1"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<? extends IResource> getResourceType() {
|
||||
return Patient.class;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>1.3</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-base</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>1.3</version>
|
||||
</dependency>
|
||||
<!--
|
||||
Because Tinder is a part of the HAPI FHIR build process (it generates
|
||||
|
|
@ -31,34 +31,37 @@
|
|||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-structures-dstu</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>1.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-structures-dstu2</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>1.3</version>
|
||||
</dependency>
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>1.3</version>
|
||||
</dependency>
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>1.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>1.3</version>
|
||||
</dependency>
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>hapi-fhir-validation-resources-dstu2.1</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>1.3</version>
|
||||
</dependency>
|
||||
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>org.apache.velocity</groupId>
|
||||
<artifactId>velocity</artifactId>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
@DatatypeDef(name="AgeDt")
|
||||
public class AgeDt extends QuantityDt {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,141 @@
|
|||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import static org.apache.commons.lang3.StringUtils.defaultString;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.lang3.Validate;
|
||||
|
||||
import ca.uhn.fhir.model.api.IBoundCodeableConcept;
|
||||
import ca.uhn.fhir.model.api.IValueSetEnumBinder;
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.dstu21.composite.CodeableConceptDt;
|
||||
import ca.uhn.fhir.model.dstu21.composite.CodingDt;
|
||||
|
||||
@DatatypeDef(name = "CodeableConcept", isSpecialization = true)
|
||||
public class BoundCodeableConceptDt<T extends Enum<?>> extends CodeableConceptDt implements IBoundCodeableConcept {
|
||||
|
||||
private IValueSetEnumBinder<T> myBinder;
|
||||
|
||||
/**
|
||||
* @deprecated This constructor is provided only for serialization support. Do not call it directly!
|
||||
*/
|
||||
@Deprecated
|
||||
public BoundCodeableConceptDt() {
|
||||
// nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public BoundCodeableConceptDt(IValueSetEnumBinder<T> theBinder) {
|
||||
Validate.notNull(theBinder, "theBinder must not be null");
|
||||
myBinder = theBinder;
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public BoundCodeableConceptDt(IValueSetEnumBinder<T> theBinder, T theValue) {
|
||||
Validate.notNull(theBinder, "theBinder must not be null");
|
||||
myBinder = theBinder;
|
||||
setValueAsEnum(theValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public BoundCodeableConceptDt(IValueSetEnumBinder<T> theBinder, Collection<T> theValues) {
|
||||
Validate.notNull(theBinder, "theBinder must not be null");
|
||||
myBinder = theBinder;
|
||||
setValueAsEnum(theValues);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the {@link #getCoding()} to contain a coding with the code and
|
||||
* system defined by the given enumerated types, AND clearing any existing
|
||||
* codings first. If theValue is null, existing codings are cleared and no
|
||||
* codings are added.
|
||||
*
|
||||
* @param theValues
|
||||
* The value to add, or <code>null</code>
|
||||
*/
|
||||
public void setValueAsEnum(Collection<T> theValues) {
|
||||
Validate.notNull(myBinder, "This object does not have a binder. Constructor BoundCodeableConceptDt() should not be called!");
|
||||
getCoding().clear();
|
||||
if (theValues != null) {
|
||||
for (T next : theValues) {
|
||||
getCoding().add(new CodingDt(myBinder.toSystemString(next), myBinder.toCodeString(next)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the {@link #getCoding()} to contain a coding with the code and
|
||||
* system defined by the given enumerated type, AND clearing any existing
|
||||
* codings first. If theValue is null, existing codings are cleared and no
|
||||
* codings are added.
|
||||
*
|
||||
* @param theValue
|
||||
* The value to add, or <code>null</code>
|
||||
*/
|
||||
public void setValueAsEnum(T theValue) {
|
||||
Validate.notNull(myBinder, "This object does not have a binder. Constructor BoundCodeableConceptDt() should not be called!");
|
||||
getCoding().clear();
|
||||
if (theValue == null) {
|
||||
return;
|
||||
}
|
||||
getCoding().add(new CodingDt(myBinder.toSystemString(theValue), myBinder.toCodeString(theValue)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Loops through the {@link #getCoding() codings} in this codeable concept
|
||||
* and returns the first bound enumerated type that matches. <b>Use
|
||||
* caution</b> using this method, see the return description for more
|
||||
* information.
|
||||
*
|
||||
* @return Returns the bound enumerated type, or <code>null</code> if none
|
||||
* are found. Note that a null return value doesn't neccesarily
|
||||
* imply that this Codeable Concept has no codes, only that it has
|
||||
* no codes that match the enum.
|
||||
*/
|
||||
public Set<T> getValueAsEnum() {
|
||||
Validate.notNull(myBinder, "This object does not have a binder. Constructor BoundCodeableConceptDt() should not be called!");
|
||||
Set<T> retVal = new HashSet<T>();
|
||||
for (CodingDt next : getCoding()) {
|
||||
if (next == null) {
|
||||
continue;
|
||||
}
|
||||
T nextT = myBinder.fromCodeString(defaultString(next.getCodeElement().getValue()), defaultString(next.getSystemElement().getValueAsString()));
|
||||
if (nextT != null) {
|
||||
retVal.add(nextT);
|
||||
} else {
|
||||
// TODO: throw special exception type?
|
||||
}
|
||||
}
|
||||
return retVal;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,229 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import ca.uhn.fhir.model.api.BaseIdentifiableElement;
|
||||
import ca.uhn.fhir.model.api.ICompositeDatatype;
|
||||
import ca.uhn.fhir.model.api.IElement;
|
||||
import ca.uhn.fhir.model.api.annotation.Child;
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.api.annotation.Description;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
|
||||
/**
|
||||
* HAPI/FHIR <b>CodeableConceptDt</b> Datatype
|
||||
* ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A concept that may be defined by a formal reference to a terminology or ontology or may be provided by text
|
||||
* </p>
|
||||
*
|
||||
* <p>
|
||||
* <b>Requirements:</b>
|
||||
* This is a common pattern in healthcare - a concept that may be defined by one or more codes from formal definitions including LOINC and SNOMED CT, and/or defined by the provision of text that captures a human sense of the concept
|
||||
* </p>
|
||||
*/
|
||||
@DatatypeDef(name="CodeableConceptDt")
|
||||
public class CodeableConceptDt
|
||||
extends BaseIdentifiableElement implements ICompositeDatatype{
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public CodeableConceptDt() {
|
||||
// nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor which creates a CodeableConceptDt with one coding repetition, containing
|
||||
* the given system and code
|
||||
*/
|
||||
public CodeableConceptDt(String theSystem, String theCode) {
|
||||
addCoding().setSystem(theSystem).setCode(theCode);
|
||||
}
|
||||
|
||||
@Child(name="coding", type=CodingDt.class, order=0, min=0, max=Child.MAX_UNLIMITED, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="A reference to a code defined by a terminology system"
|
||||
)
|
||||
private java.util.List<CodingDt> myCoding;
|
||||
|
||||
@Child(name="text", type=StringDt.class, order=1, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user"
|
||||
)
|
||||
private StringDt myText;
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myCoding, myText);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
|
||||
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myCoding, myText);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>coding</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference to a code defined by a terminology system
|
||||
* </p>
|
||||
*/
|
||||
public java.util.List<CodingDt> getCoding() {
|
||||
if (myCoding == null) {
|
||||
myCoding = new java.util.ArrayList<CodingDt>();
|
||||
}
|
||||
return myCoding;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>coding</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference to a code defined by a terminology system
|
||||
* </p>
|
||||
*/
|
||||
public CodeableConceptDt setCoding(java.util.List<CodingDt> theValue) {
|
||||
myCoding = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Adds and returns a new value for <b>coding</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference to a code defined by a terminology system
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt addCoding() {
|
||||
CodingDt newType = new CodingDt();
|
||||
getCoding().add(newType);
|
||||
return newType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a given new value for <b>coding</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference to a code defined by a terminology system
|
||||
* </p>
|
||||
* @param theValue The coding to add (must not be <code>null</code>)
|
||||
*/
|
||||
public CodeableConceptDt addCoding(CodingDt theValue) {
|
||||
if (theValue == null) {
|
||||
throw new NullPointerException("theValue must not be null");
|
||||
}
|
||||
getCoding().add(theValue);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the first repetition for <b>coding</b> (),
|
||||
* creating it if it does not already exist.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference to a code defined by a terminology system
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt getCodingFirstRep() {
|
||||
if (getCoding().isEmpty()) {
|
||||
return addCoding();
|
||||
}
|
||||
return getCoding().get(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>text</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user
|
||||
* </p>
|
||||
*/
|
||||
public StringDt getTextElement() {
|
||||
if (myText == null) {
|
||||
myText = new StringDt();
|
||||
}
|
||||
return myText;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>text</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user
|
||||
* </p>
|
||||
*/
|
||||
public String getText() {
|
||||
return getTextElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>text</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user
|
||||
* </p>
|
||||
*/
|
||||
public CodeableConceptDt setText(StringDt theValue) {
|
||||
myText = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>text</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user
|
||||
* </p>
|
||||
*/
|
||||
public CodeableConceptDt setText( String theString) {
|
||||
myText = new StringDt(theString);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,426 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import ca.uhn.fhir.model.api.ICompositeDatatype;
|
||||
import ca.uhn.fhir.model.api.IElement;
|
||||
import ca.uhn.fhir.model.api.annotation.Child;
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.api.annotation.Description;
|
||||
import ca.uhn.fhir.model.base.composite.BaseCodingDt;
|
||||
import ca.uhn.fhir.model.primitive.BooleanDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
|
||||
/**
|
||||
* HAPI/FHIR <b>CodingDt</b> Datatype
|
||||
* ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference to a code defined by a terminology system
|
||||
* </p>
|
||||
*
|
||||
* <p>
|
||||
* <b>Requirements:</b>
|
||||
* References to codes are very common in healthcare models
|
||||
* </p>
|
||||
*/
|
||||
@DatatypeDef(name="CodingDt")
|
||||
public class CodingDt
|
||||
extends BaseCodingDt implements ICompositeDatatype, org.hl7.fhir.instance.model.api.IBaseCoding {
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public CodingDt() {
|
||||
// nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new Coding with the given system and code
|
||||
*/
|
||||
public CodingDt(String theSystem, String theCode) {
|
||||
setSystem(theSystem);
|
||||
setCode(theCode);
|
||||
}
|
||||
|
||||
/**
|
||||
* Copy constructor: Creates a new Coding with the system and code copied out of the given coding
|
||||
*/
|
||||
public CodingDt(BaseCodingDt theCoding) {
|
||||
this(theCoding.getSystemElement().getValueAsString(), theCoding.getCodeElement().getValue());
|
||||
}
|
||||
|
||||
|
||||
@Child(name="system", type=UriDt.class, order=0, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="The identification of the code system that defines the meaning of the symbol in the code."
|
||||
)
|
||||
private UriDt mySystem;
|
||||
|
||||
@Child(name="version", type=StringDt.class, order=1, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and when the meaning is not guaranteed to be consistent, the version SHOULD be exchanged"
|
||||
)
|
||||
private StringDt myVersion;
|
||||
|
||||
@Child(name="code", type=CodeDt.class, order=2, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination)"
|
||||
)
|
||||
private CodeDt myCode;
|
||||
|
||||
@Child(name="display", type=StringDt.class, order=3, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="A representation of the meaning of the code in the system, following the rules of the system"
|
||||
)
|
||||
private StringDt myDisplay;
|
||||
|
||||
@Child(name="userSelected", type=BooleanDt.class, order=4, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays)"
|
||||
)
|
||||
private BooleanDt myUserSelected;
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( mySystem, myVersion, myCode, myDisplay, myUserSelected);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
|
||||
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, mySystem, myVersion, myCode, myDisplay, myUserSelected);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>system</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The identification of the code system that defines the meaning of the symbol in the code.
|
||||
* </p>
|
||||
*/
|
||||
public UriDt getSystemElement() {
|
||||
if (mySystem == null) {
|
||||
mySystem = new UriDt();
|
||||
}
|
||||
return mySystem;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>system</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The identification of the code system that defines the meaning of the symbol in the code.
|
||||
* </p>
|
||||
*/
|
||||
public String getSystem() {
|
||||
return getSystemElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>system</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The identification of the code system that defines the meaning of the symbol in the code.
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setSystem(UriDt theValue) {
|
||||
mySystem = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>system</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The identification of the code system that defines the meaning of the symbol in the code.
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setSystem( String theUri) {
|
||||
mySystem = new UriDt(theUri);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>version</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and when the meaning is not guaranteed to be consistent, the version SHOULD be exchanged
|
||||
* </p>
|
||||
*/
|
||||
public StringDt getVersionElement() {
|
||||
if (myVersion == null) {
|
||||
myVersion = new StringDt();
|
||||
}
|
||||
return myVersion;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>version</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and when the meaning is not guaranteed to be consistent, the version SHOULD be exchanged
|
||||
* </p>
|
||||
*/
|
||||
public String getVersion() {
|
||||
return getVersionElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>version</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and when the meaning is not guaranteed to be consistent, the version SHOULD be exchanged
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setVersion(StringDt theValue) {
|
||||
myVersion = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>version</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and when the meaning is not guaranteed to be consistent, the version SHOULD be exchanged
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setVersion( String theString) {
|
||||
myVersion = new StringDt(theString);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>code</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination)
|
||||
* </p>
|
||||
*/
|
||||
public CodeDt getCodeElement() {
|
||||
if (myCode == null) {
|
||||
myCode = new CodeDt();
|
||||
}
|
||||
return myCode;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>code</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination)
|
||||
* </p>
|
||||
*/
|
||||
public String getCode() {
|
||||
return getCodeElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>code</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination)
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setCode(CodeDt theValue) {
|
||||
myCode = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>code</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination)
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setCode( String theCode) {
|
||||
myCode = new CodeDt(theCode);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>display</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A representation of the meaning of the code in the system, following the rules of the system
|
||||
* </p>
|
||||
*/
|
||||
public StringDt getDisplayElement() {
|
||||
if (myDisplay == null) {
|
||||
myDisplay = new StringDt();
|
||||
}
|
||||
return myDisplay;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>display</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A representation of the meaning of the code in the system, following the rules of the system
|
||||
* </p>
|
||||
*/
|
||||
public String getDisplay() {
|
||||
return getDisplayElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>display</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A representation of the meaning of the code in the system, following the rules of the system
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setDisplay(StringDt theValue) {
|
||||
myDisplay = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>display</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A representation of the meaning of the code in the system, following the rules of the system
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setDisplay( String theString) {
|
||||
myDisplay = new StringDt(theString);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>userSelected</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays)
|
||||
* </p>
|
||||
*/
|
||||
public BooleanDt getUserSelectedElement() {
|
||||
if (myUserSelected == null) {
|
||||
myUserSelected = new BooleanDt();
|
||||
}
|
||||
return myUserSelected;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>userSelected</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays)
|
||||
* </p>
|
||||
*/
|
||||
public Boolean getUserSelected() {
|
||||
return getUserSelectedElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>userSelected</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays)
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setUserSelected(BooleanDt theValue) {
|
||||
myUserSelected = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>userSelected</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays)
|
||||
* </p>
|
||||
*/
|
||||
public CodingDt setUserSelected( boolean theBoolean) {
|
||||
myUserSelected = new BooleanDt(theBoolean);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import ca.uhn.fhir.model.api.IDatatype;
|
||||
import ca.uhn.fhir.model.api.IResource;
|
||||
import ca.uhn.fhir.model.api.annotation.Child;
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.base.composite.BaseContainedDt;
|
||||
|
||||
@DatatypeDef(name = "contained")
|
||||
public class ContainedDt extends BaseContainedDt {
|
||||
|
||||
@Child(name = "resource", type = IResource.class, order = 0, min = 0, max = Child.MAX_UNLIMITED)
|
||||
private List<IResource> myContainedResources;
|
||||
|
||||
public List<IResource> getContainedResources() {
|
||||
if (myContainedResources == null) {
|
||||
myContainedResources = new ArrayList<IResource>();
|
||||
}
|
||||
return myContainedResources;
|
||||
}
|
||||
|
||||
public void setContainedResources(List<IResource> theContainedResources) {
|
||||
myContainedResources = theContainedResources;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return myContainedResources == null || myContainedResources.size() == 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
@DatatypeDef(name="CountDt")
|
||||
public class CountDt extends QuantityDt {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
|
||||
import ca.uhn.fhir.model.primitive.IntegerDt;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
@DatatypeDef(name="DistanceDt")
|
||||
public class DistanceDt extends QuantityDt {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
@DatatypeDef(name="DurationDt")
|
||||
public class DurationDt extends QuantityDt {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
@DatatypeDef(name="Money")
|
||||
public class MoneyDt extends QuantityDt {
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,142 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import ca.uhn.fhir.model.api.IElement;
|
||||
import ca.uhn.fhir.model.api.annotation.Child;
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.base.composite.BaseNarrativeDt;
|
||||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.XhtmlDt;
|
||||
|
||||
/**
|
||||
* HAPI/FHIR <b>Narrative</b> Datatype
|
||||
* (A human-readable formatted text, including images)
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A human-readable formatted text, including images
|
||||
* </p>
|
||||
*
|
||||
* <p>
|
||||
* <b>Requirements:</b>
|
||||
*
|
||||
* </p>
|
||||
*/
|
||||
@DatatypeDef(name="Narrative")
|
||||
public class NarrativeDt extends BaseNarrativeDt {
|
||||
|
||||
@Child(name="div", type=XhtmlDt.class, order=1, min=1, max=1)
|
||||
private XhtmlDt myDiv;
|
||||
|
||||
public NarrativeDt() {
|
||||
// nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return ca.uhn.fhir.util.ElementUtil.isEmpty( myDiv );
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
|
||||
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements( theType, myDiv );
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>div</b> (Limited xhtml content).
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The actual narrative content, a stripped down version of XHTML
|
||||
* </p>
|
||||
*/
|
||||
public XhtmlDt getDivElement() {
|
||||
return getDiv();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>div</b> (Limited xhtml content).
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The actual narrative content, a stripped down version of XHTML
|
||||
* </p>
|
||||
*/
|
||||
public XhtmlDt getDiv() {
|
||||
if (myDiv == null) {
|
||||
myDiv = new XhtmlDt();
|
||||
}
|
||||
return myDiv;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>div</b> (Limited xhtml content)
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The actual narrative content, a stripped down version of XHTML
|
||||
* </p>
|
||||
*/
|
||||
public void setDiv(XhtmlDt theValue) {
|
||||
myDiv = theValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value using a textual DIV (or simple text block which will be
|
||||
* converted to XHTML)
|
||||
*/
|
||||
public void setDiv(String theTextDiv) {
|
||||
myDiv = new XhtmlDt(theTextDiv);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BoundCodeDt getStatus() {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,523 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
import ca.uhn.fhir.model.api.ICompositeDatatype;
|
||||
import ca.uhn.fhir.model.api.IElement;
|
||||
import ca.uhn.fhir.model.api.annotation.Child;
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.api.annotation.Description;
|
||||
import ca.uhn.fhir.model.api.annotation.SimpleSetter;
|
||||
import ca.uhn.fhir.model.base.composite.BaseQuantityDt;
|
||||
import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum;
|
||||
import ca.uhn.fhir.model.primitive.BoundCodeDt;
|
||||
import ca.uhn.fhir.model.primitive.CodeDt;
|
||||
import ca.uhn.fhir.model.primitive.DecimalDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.model.primitive.UriDt;
|
||||
|
||||
/**
|
||||
* HAPI/FHIR <b>QuantityDt</b> Datatype
|
||||
* ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies
|
||||
* </p>
|
||||
*
|
||||
* <p>
|
||||
* <b>Requirements:</b>
|
||||
* Need to able to capture all sorts of measured values, even if the measured value are not precisely quantified. Values include exact measures such as 3.51g, customary units such as 3 tablets, and currencies such as $100.32USD
|
||||
* </p>
|
||||
*/
|
||||
@DatatypeDef(name="QuantityDt")
|
||||
public class QuantityDt
|
||||
extends BaseQuantityDt implements ICompositeDatatype{
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public QuantityDt() {
|
||||
// nothing
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public QuantityDt(@SimpleSetter.Parameter(name="theValue") double theValue) {
|
||||
setValue(theValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public QuantityDt(@SimpleSetter.Parameter(name="theValue") long theValue) {
|
||||
setValue(theValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityComparatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") double theValue,
|
||||
@SimpleSetter.Parameter(name = "theUnits") String theUnits) {
|
||||
setValue(theValue);
|
||||
setComparator(theComparator);
|
||||
setUnits(theUnits);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public QuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityComparatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") long theValue,
|
||||
@SimpleSetter.Parameter(name = "theUnits") String theUnits) {
|
||||
setValue(theValue);
|
||||
setComparator(theComparator);
|
||||
setUnits(theUnits);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public QuantityDt(@SimpleSetter.Parameter(name="theComparator") QuantityComparatorEnum theComparator, @SimpleSetter.Parameter(name="theValue") double theValue, @SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theUnits") String theUnits) {
|
||||
setValue(theValue);
|
||||
setComparator(theComparator);
|
||||
setSystem(theSystem);
|
||||
setUnits(theUnits);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public QuantityDt(@SimpleSetter.Parameter(name="theComparator") QuantityComparatorEnum theComparator, @SimpleSetter.Parameter(name="theValue") long theValue, @SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theUnits") String theUnits) {
|
||||
setValue(theValue);
|
||||
setComparator(theComparator);
|
||||
setSystem(theSystem);
|
||||
setUnits(theUnits);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link #setUnit(String)} instead - Quantity.units was renamed to Quantity.unit in DSTU2
|
||||
*/
|
||||
@Deprecated
|
||||
@Override
|
||||
public BaseQuantityDt setUnits(String theString) {
|
||||
return setUnit(theString);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Use {@link #getUnitElement()} - Quantity.units was renamed to Quantity.unit in DSTU2
|
||||
*/
|
||||
@Deprecated
|
||||
@Override
|
||||
public StringDt getUnitsElement() {
|
||||
return getUnitElement();
|
||||
}
|
||||
|
||||
@Child(name="value", type=DecimalDt.class, order=0, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="The value of the measured amount. The value includes an implicit precision in the presentation of the value"
|
||||
)
|
||||
private DecimalDt myValue;
|
||||
|
||||
@Child(name="comparator", type=CodeDt.class, order=1, min=0, max=1, summary=true, modifier=true)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues; e.g. if the comparator is \"<\" , then the real value is < stated value"
|
||||
)
|
||||
private BoundCodeDt<QuantityComparatorEnum> myComparator;
|
||||
|
||||
@Child(name="unit", type=StringDt.class, order=2, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="A human-readable form of the unit"
|
||||
)
|
||||
private StringDt myUnit;
|
||||
|
||||
@Child(name="system", type=UriDt.class, order=3, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="The identification of the system that provides the coded form of the unit"
|
||||
)
|
||||
private UriDt mySystem;
|
||||
|
||||
@Child(name="code", type=CodeDt.class, order=4, min=0, max=1, summary=true, modifier=false)
|
||||
@Description(
|
||||
shortDefinition="",
|
||||
formalDefinition="A computer processable form of the unit in some unit representation system"
|
||||
)
|
||||
private CodeDt myCode;
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myValue, myComparator, myUnit, mySystem, myCode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
|
||||
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myValue, myComparator, myUnit, mySystem, myCode);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>value</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
|
||||
* </p>
|
||||
*/
|
||||
public DecimalDt getValueElement() {
|
||||
if (myValue == null) {
|
||||
myValue = new DecimalDt();
|
||||
}
|
||||
return myValue;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>value</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
|
||||
* </p>
|
||||
*/
|
||||
public BigDecimal getValue() {
|
||||
return getValueElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>value</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setValue(DecimalDt theValue) {
|
||||
myValue = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>value</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setValue( long theValue) {
|
||||
myValue = new DecimalDt(theValue);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value for <b>value</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setValue( double theValue) {
|
||||
myValue = new DecimalDt(theValue);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value for <b>value</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The value of the measured amount. The value includes an implicit precision in the presentation of the value
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setValue( java.math.BigDecimal theValue) {
|
||||
myValue = new DecimalDt(theValue);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>comparator</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues; e.g. if the comparator is \"<\" , then the real value is < stated value
|
||||
* </p>
|
||||
*/
|
||||
public BoundCodeDt<QuantityComparatorEnum> getComparatorElement() {
|
||||
if (myComparator == null) {
|
||||
myComparator = new BoundCodeDt<QuantityComparatorEnum>(QuantityComparatorEnum.VALUESET_BINDER);
|
||||
}
|
||||
return myComparator;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>comparator</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues; e.g. if the comparator is \"<\" , then the real value is < stated value
|
||||
* </p>
|
||||
*/
|
||||
public String getComparator() {
|
||||
return getComparatorElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>comparator</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues; e.g. if the comparator is \"<\" , then the real value is < stated value
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setComparator(BoundCodeDt<QuantityComparatorEnum> theValue) {
|
||||
myComparator = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>comparator</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* How the value should be understood and represented - whether the actual value is greater or less than the stated value due to measurement issues; e.g. if the comparator is \"<\" , then the real value is < stated value
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setComparator(QuantityComparatorEnum theValue) {
|
||||
setComparator(new BoundCodeDt<QuantityComparatorEnum>(QuantityComparatorEnum.VALUESET_BINDER, theValue));
|
||||
|
||||
/*
|
||||
getComparatorElement().setValueAsEnum(theValue);
|
||||
*/
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>unit</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A human-readable form of the unit
|
||||
* </p>
|
||||
*/
|
||||
public StringDt getUnitElement() {
|
||||
if (myUnit == null) {
|
||||
myUnit = new StringDt();
|
||||
}
|
||||
return myUnit;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>unit</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A human-readable form of the unit
|
||||
* </p>
|
||||
*/
|
||||
public String getUnit() {
|
||||
return getUnitElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>unit</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A human-readable form of the unit
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setUnit(StringDt theValue) {
|
||||
myUnit = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>unit</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A human-readable form of the unit
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setUnit( String theString) {
|
||||
myUnit = new StringDt(theString);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>system</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The identification of the system that provides the coded form of the unit
|
||||
* </p>
|
||||
*/
|
||||
public UriDt getSystemElement() {
|
||||
if (mySystem == null) {
|
||||
mySystem = new UriDt();
|
||||
}
|
||||
return mySystem;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>system</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The identification of the system that provides the coded form of the unit
|
||||
* </p>
|
||||
*/
|
||||
public String getSystem() {
|
||||
return getSystemElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>system</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The identification of the system that provides the coded form of the unit
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setSystem(UriDt theValue) {
|
||||
mySystem = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>system</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* The identification of the system that provides the coded form of the unit
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setSystem( String theUri) {
|
||||
mySystem = new UriDt(theUri);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>code</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A computer processable form of the unit in some unit representation system
|
||||
* </p>
|
||||
*/
|
||||
public CodeDt getCodeElement() {
|
||||
if (myCode == null) {
|
||||
myCode = new CodeDt();
|
||||
}
|
||||
return myCode;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>code</b> ().
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A computer processable form of the unit in some unit representation system
|
||||
* </p>
|
||||
*/
|
||||
public String getCode() {
|
||||
return getCodeElement().getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>code</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A computer processable form of the unit in some unit representation system
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setCode(CodeDt theValue) {
|
||||
myCode = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value for <b>code</b> ()
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A computer processable form of the unit in some unit representation system
|
||||
* </p>
|
||||
*/
|
||||
public QuantityDt setCode( String theCode) {
|
||||
myCode = new CodeDt(theCode);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,256 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.hl7.fhir.instance.model.api.IIdType;
|
||||
|
||||
import ca.uhn.fhir.model.api.ICompositeDatatype;
|
||||
import ca.uhn.fhir.model.api.IElement;
|
||||
import ca.uhn.fhir.model.api.IResource;
|
||||
import ca.uhn.fhir.model.api.annotation.Child;
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.api.annotation.Description;
|
||||
import ca.uhn.fhir.model.api.annotation.SimpleSetter;
|
||||
import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt;
|
||||
import ca.uhn.fhir.model.primitive.IdDt;
|
||||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
|
||||
/**
|
||||
* HAPI/FHIR <b>ResourceReferenceDt</b> Datatype
|
||||
* (A reference from one resource to another)
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference from one resource to another
|
||||
* </p>
|
||||
*
|
||||
* <p>
|
||||
* <b>Requirements:</b>
|
||||
*
|
||||
* </p>
|
||||
*/
|
||||
@DatatypeDef(name="ResourceReferenceDt")
|
||||
public class ResourceReferenceDt
|
||||
extends BaseResourceReferenceDt implements ICompositeDatatype
|
||||
{
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public ResourceReferenceDt() {
|
||||
// nothing
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor which creates a resource reference containing the actual resource in question.
|
||||
* <p>
|
||||
* <b> When using this in a server:</b> Generally if this is serialized, it will be serialized as a contained
|
||||
* resource, so this should not be used if the intent is not to actually supply the referenced resource. This is not
|
||||
* a hard-and-fast rule however, as the server can be configured to not serialized this resource, or to load an ID
|
||||
* and contain even if this constructor is not used.
|
||||
* </p>
|
||||
*
|
||||
* @param theResource
|
||||
* The resource instance
|
||||
*/
|
||||
@SimpleSetter()
|
||||
public ResourceReferenceDt(IResource theResource) {
|
||||
super(theResource);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor which accepts a reference directly (this can be an ID, a partial/relative URL or a complete/absolute
|
||||
* URL)
|
||||
*
|
||||
* @param theId
|
||||
* The reference itself
|
||||
*/
|
||||
public ResourceReferenceDt(String theId) {
|
||||
setReference(new IdDt(theId));
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor which accepts a reference directly (this can be an ID, a partial/relative URL or a complete/absolute
|
||||
* URL)
|
||||
*
|
||||
* @param theResourceId
|
||||
* The reference itself
|
||||
*/
|
||||
public ResourceReferenceDt(IdDt theResourceId) {
|
||||
setReference(theResourceId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor which accepts a reference directly (this can be an ID, a partial/relative URL or a complete/absolute
|
||||
* URL)
|
||||
*
|
||||
* @param theResourceId
|
||||
* The reference itself
|
||||
*/
|
||||
public ResourceReferenceDt(IIdType theResourceId) {
|
||||
setReference(theResourceId);
|
||||
}
|
||||
|
||||
@Child(name="reference", type=IdDt.class, order=0, min=0, max=1)
|
||||
@Description(
|
||||
shortDefinition="Relative, internal or absolute URL reference",
|
||||
formalDefinition="A reference to a location at which the other resource is found. The reference may a relative reference, in which case it is relative to the service base URL, or an absolute URL that resolves to the location where the resource is found. The reference may be version specific or not. If the reference is not to a FHIR RESTful server, then it should be assumed to be version specific. Internal fragment references (start with '#') refer to contained resources"
|
||||
)
|
||||
private IdDt myReference;
|
||||
|
||||
@Child(name="display", type=StringDt.class, order=1, min=0, max=1)
|
||||
@Description(
|
||||
shortDefinition="Text alternative for the resource",
|
||||
formalDefinition="Plain text narrative that identifies the resource in addition to the resource reference"
|
||||
)
|
||||
private StringDt myDisplay;
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return super.isBaseEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty( myReference, myDisplay);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends IElement> List<T> getAllPopulatedChildElementsOfType(Class<T> theType) {
|
||||
return ca.uhn.fhir.util.ElementUtil.allPopulatedChildElements(theType, myReference, myDisplay);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>reference</b> (Relative, internal or absolute URL reference).
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference to a location at which the other resource is found. The reference may a relative reference, in which case it is relative to the service base URL, or an absolute URL that resolves to the location where the resource is found. The reference may be version specific or not. If the reference is not to a FHIR RESTful server, then it should be assumed to be version specific. Internal fragment references (start with '#') refer to contained resources
|
||||
* </p>
|
||||
*/
|
||||
public IdDt getReference() {
|
||||
if (myReference == null) {
|
||||
myReference = new IdDt();
|
||||
}
|
||||
return myReference;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IdDt getReferenceElement() {
|
||||
return getReference();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>reference</b> (Relative, internal or absolute URL reference)
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference to a location at which the other resource is found. The reference may a relative reference, in which case it is relative to the service base URL, or an absolute URL that resolves to the location where the resource is found. The reference may be version specific or not. If the reference is not to a FHIR RESTful server, then it should be assumed to be version specific. Internal fragment references (start with '#') refer to contained resources
|
||||
* </p>
|
||||
*/
|
||||
public ResourceReferenceDt setReference(IdDt theValue) {
|
||||
myReference = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value for <b>reference</b> (Relative, internal or absolute URL reference)
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* A reference to a location at which the other resource is found. The reference may a relative reference, in which case it is relative to the service base URL, or an absolute URL that resolves to the location where the resource is found. The reference may be version specific or not. If the reference is not to a FHIR RESTful server, then it should be assumed to be version specific. Internal fragment references (start with '#') refer to contained resources
|
||||
* </p>
|
||||
*/
|
||||
public ResourceReferenceDt setReference( String theId) {
|
||||
myReference = new IdDt(theId);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the value(s) for <b>display</b> (Text alternative for the resource).
|
||||
* creating it if it does
|
||||
* not exist. Will not return <code>null</code>.
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* Plain text narrative that identifies the resource in addition to the resource reference
|
||||
* </p>
|
||||
*/
|
||||
public StringDt getDisplay() {
|
||||
if (myDisplay == null) {
|
||||
myDisplay = new StringDt();
|
||||
}
|
||||
return myDisplay;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value(s) for <b>display</b> (Text alternative for the resource)
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* Plain text narrative that identifies the resource in addition to the resource reference
|
||||
* </p>
|
||||
*/
|
||||
public ResourceReferenceDt setDisplay(StringDt theValue) {
|
||||
myDisplay = theValue;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the value for <b>display</b> (Text alternative for the resource)
|
||||
*
|
||||
* <p>
|
||||
* <b>Definition:</b>
|
||||
* Plain text narrative that identifies the resource in addition to the resource reference
|
||||
* </p>
|
||||
*/
|
||||
public ResourceReferenceDt setDisplay( String theString) {
|
||||
myDisplay = new StringDt(theString);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public StringDt getDisplayElement() {
|
||||
return getDisplay();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
package ca.uhn.fhir.model.dstu21.composite;
|
||||
|
||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||
import ca.uhn.fhir.model.api.annotation.SimpleSetter;
|
||||
import ca.uhn.fhir.model.dstu2.valueset.QuantityComparatorEnum;
|
||||
|
||||
/*
|
||||
* #%L
|
||||
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
|
||||
* %%
|
||||
* Copyright (C) 2014 - 2015 University Health Network
|
||||
* %%
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* #L%
|
||||
*/
|
||||
|
||||
@DatatypeDef(name="SimpleQuantity")
|
||||
public class SimpleQuantityDt extends QuantityDt {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
public SimpleQuantityDt() {
|
||||
// nothing
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public SimpleQuantityDt(@SimpleSetter.Parameter(name="theValue") double theValue) {
|
||||
setValue(theValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public SimpleQuantityDt(@SimpleSetter.Parameter(name="theValue") long theValue) {
|
||||
setValue(theValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public SimpleQuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityComparatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") double theValue,
|
||||
@SimpleSetter.Parameter(name = "theUnits") String theUnits) {
|
||||
setValue(theValue);
|
||||
setComparator(theComparator);
|
||||
setUnit(theUnits);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public SimpleQuantityDt(@SimpleSetter.Parameter(name = "theComparator") QuantityComparatorEnum theComparator, @SimpleSetter.Parameter(name = "theValue") long theValue,
|
||||
@SimpleSetter.Parameter(name = "theUnits") String theUnits) {
|
||||
setValue(theValue);
|
||||
setComparator(theComparator);
|
||||
setUnit(theUnits);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public SimpleQuantityDt(@SimpleSetter.Parameter(name="theValue") double theValue, @SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theUnits") String theUnits) {
|
||||
setValue(theValue);
|
||||
setSystem(theSystem);
|
||||
setUnit(theUnits);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
@SimpleSetter
|
||||
public SimpleQuantityDt(@SimpleSetter.Parameter(name="theValue") long theValue, @SimpleSetter.Parameter(name="theSystem") String theSystem, @SimpleSetter.Parameter(name="theUnits") String theUnits) {
|
||||
setValue(theValue);
|
||||
setSystem(theSystem);
|
||||
setUnit(theUnits);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -27,6 +27,12 @@
|
|||
<action type="add">
|
||||
CLI now supports writing to file:// URL for 'upload-examples' command
|
||||
</action>
|
||||
<action type="add">
|
||||
GZipped content is now supported for client-to-server uploads (create, update, transaction, etc.).
|
||||
The server will not automatically detect compressed incoming content and decompress it (this can be
|
||||
disabled using a RestfulServer configuration setting). A new client interceptor has been added
|
||||
which compresses outgoing content from the client.
|
||||
</action>
|
||||
</release>
|
||||
<release version="1.3" date="2015-11-14">
|
||||
<action type="add">
|
||||
|
|
|
|||
|
|
@ -82,6 +82,22 @@
|
|||
|
||||
</subsection>
|
||||
|
||||
<subsection name="Performance: GZip Outgoing Request Bodies">
|
||||
|
||||
<p>
|
||||
The <code>GZipContentInterceptor</code> compresses outgoing contents.
|
||||
With this interceptor, if the client is transmitting resources to the server
|
||||
(e.g. for a create, update, transaction, etc.) the content will be GZipped
|
||||
before transmission to the server.
|
||||
</p>
|
||||
|
||||
<macro name="snippet">
|
||||
<param name="id" value="cookie" />
|
||||
<param name="file" value="examples/src/main/java/example/ClientExamples.java" />
|
||||
</macro>
|
||||
|
||||
</subsection>
|
||||
|
||||
</section>
|
||||
|
||||
</body>
|
||||
|
|
|
|||
Loading…
Reference in New Issue